Joey Hess
7264b9aa8c
tweak wording
2019-05-01 14:29:10 -04:00
Joey Hess
a32f31235a
reuse old imported commits
...
This avoids proliferation of different import commits for the same
trees, and makes the resulting git history nice.
2019-05-01 14:20:26 -04:00
Joey Hess
83a420dd66
update todo
2019-04-30 16:31:46 -04:00
Joey Hess
1503b86a14
make import tree from remote generate a merge commit
...
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.
Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.
The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.
This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
2019-04-30 16:13:21 -04:00
Joey Hess
ca385a09c1
rename problem
2019-04-24 15:52:05 -04:00
Joey Hess
a71ae8053e
Merge branch 'master' into import-from-s3
2019-04-24 15:22:25 -04:00
Joey Hess
5b09b016fe
update
2019-04-24 15:22:02 -04:00
avar
8876e6a4de
Added a comment: A useful command in combination with this
2019-04-24 12:37:36 +00:00
Joey Hess
b4230bd023
devblog
2019-04-23 16:36:50 -04:00
Joey Hess
2d0dd34916
initial work toward correctly merging deeper import histories
...
Pure code is tested working, including with even histories that merge
several lines of development. Needs to be hooked up to git histories
next.
2019-04-23 16:34:19 -04:00
Joey Hess
48d30d8753
Merge branch 'master' into import-from-s3
2019-04-23 15:34:26 -04:00
Joey Hess
c3f5e7863c
some more todos
2019-04-23 15:34:11 -04:00
Joey Hess
8d01b00507
update status
2019-04-23 14:50:33 -04:00
Joey Hess
cab28b48af
reorder
2019-04-23 14:45:34 -04:00
Joey Hess
a42e7a012a
refuse unsafe store to unversioned exporttree with old aws version
...
I've developed a patch to aws, once it gets merged, the real version
number of aws can be filled in.
2019-04-23 14:39:30 -04:00
Joey Hess
ae21c88640
tested S3 import/export with versioned bucket
...
rename and delete working
2019-04-23 13:43:41 -04:00
Joey Hess
0c878899ea
update status
2019-04-23 13:21:38 -04:00
Joey Hess
67d6280242
document importree for S3
2019-04-23 13:19:08 -04:00
Joey Hess
22fbab0563
close
2019-04-23 12:42:13 -04:00
Ilya_Shlyakhter
4c79f2b4ac
added suggestion to use git-replace for better implement git-annex-migrate
2019-04-22 01:26:55 +00:00
richih@c163df26fe804f6b596ffbfefe3691879d60c12d
2deb3e9129
2019-04-21 20:27:02 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
b851c12972
2019-04-21 20:09:20 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
c1f5e5a9f1
2019-04-21 16:39:13 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
2e31977789
2019-04-20 23:10:26 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
b23e3a83b1
2019-04-20 23:06:15 +00:00
Joey Hess
6f846f4c38
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-19 15:21:34 -04:00
Joey Hess
a7ba22ffd3
devblog
2019-04-19 15:20:55 -04:00
Joey Hess
2f79cb4b45
versioned import from S3 is working
...
Still some bugs and two stubbed methods to implement though.
2019-04-19 15:13:49 -04:00
Joey Hess
55a5d9679a
implemented mkImportableContentsVersioned
2019-04-19 13:39:33 -04:00
yarikoptic
2c61fbf858
Added a comment: indeed a useful use case
2019-04-19 13:26:05 +00:00
Joey Hess
af332f8b36
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-18 16:38:37 -04:00
Joey Hess
e65455fdda
devblog
2019-04-18 16:38:15 -04:00
Joey Hess
1968f6d9c6
designing S3 GetBucketObjectVersions to ImportableContents algo
...
I think I have a good algo now, at least poorly explained in English..
2019-04-18 16:25:04 -04:00
CandyAngel
c9be042c13
removed
2019-04-18 18:07:25 +00:00
maryjil2596
352612618c
Added a comment: samsung printer error code u1-2320
2019-04-18 10:10:14 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
fd477eff80
Added a comment: Unusual behavior
2019-04-18 01:36:05 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
a2f6d5633f
2019-04-16 21:51:12 +00:00
Joey Hess
2f740d14da
hmm
2019-04-16 13:18:59 -04:00
Joey Hess
7f50371bf2
split out section on common configuration parameters
2019-04-16 13:09:12 -04:00
Joey Hess
935eed0bb0
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-16 12:27:27 -04:00
Joey Hess
eaa4042c39
forgot to add man page
2019-04-16 12:25:49 -04:00
strmd
659292a5a4
Added a comment
2019-04-16 15:12:57 +00:00
CandyAngel
34233d2773
Added a comment
2019-04-16 13:10:03 +00:00
strmd
acf7ac168e
2019-04-16 12:28:46 +00:00
mario
b9c9a74a3b
Added a comment: Thanks
2019-04-16 11:07:11 +00:00
Joey Hess
a474304f1d
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-15 13:49:16 -04:00
Joey Hess
c0c38e986d
added renameremote command
2019-04-15 13:49:03 -04:00
Joey Hess
ed1a0926c1
don't list subpages of todos
2019-04-15 13:01:53 -04:00
Joey Hess
de7a510da1
update
2019-04-15 13:00:46 -04:00
Joey Hess
00b1943927
close
2019-04-15 12:59:39 -04:00
