This commit is contained in:
Joey Hess 2019-05-01 14:46:42 -04:00
parent 70d16d07fe
commit 63ed61ae3d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 18 additions and 0 deletions

View file

@ -0,0 +1,18 @@
Finally got the remote tracking branch for import from S3 into a good shape.
Rather than coaxing git into generating the same commits each time for
imports (which would have needed commit dates to be stable somehow),
I made git-annex always preserve a reference to the last import commit.
[[s3rename.png]]
Here's how it looks when a rename was exported to S3, which resulted in a
history in S3 that diverged and reconverged with the git history.
[[s3history.png]]
And here's how the history develops as more changes get exported and
imported.
With adb and S3 import done, the first phase of [[todo/import_tree]] is
complete.

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB