mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devblog

Browse source
This commit is contained in:
Joey Hess 2019-04-24 18:37:04 -04:00
parent 8876e6a4de
commit 5b0e5922f5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/devblog/day_584__matching_S3_histories.mdwn Normal file
View file

@ -0,0 +1,16 @@
I've been working on matching up the git history with the history from a
versioned S3 export. Got sidetracked for quite a while building an
efficient way to get the git history up to a certian depth (including all
sides of merge commits) without reading the entire `git log` output.
The history matching is mostly working now, but there's a problem when a
rename is exported to S3, because it's non-atomic on S3 and atomic in git,
and so the histories stop matching up. This is not fatal, just results
in an ugly git history with the right tree at the top of it. It's
not entirely wrong; the git repo and the S3 bucket did legitimately diverge
for a while, so shouldn't the merged history reflect that? The problem is
just that the divergence is not represented in the opimal way.
I hate giving up at the final hurdle, but I feel I need to think about this
some more, so merging `import-from-s3` is postponed for another day, or
likely until Monday.