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

Added a comment

Browse source
This commit is contained in:
http://joeyh.name/ 2013-04-26 20:06:34 +00:00 committed by admin
parent 7ec5454ff7
commit bc0ce39db9
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/forum/Not_sure_how_to_get_my_s3_remote_back/comment_8_36519ee4499a19f0864e4fcd264e9933._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 8"
date="2013-04-26T20:06:34Z"
content="""
Most of this is perfectly normal. The duplication of lines are normal; when two git-annex branches are union merged, it's as if it runs `cat branch1:file branch2:file | uniq > file`. When there are conflicting lines for the same uuid, the one with the newest timestamp is used.
The description of the remote in uuid.log is also not relevant to this bug.
This is the key part:
> The box remote was duplicated (with different davcreds and one having highRandomQuality=false)
As you note, 2013-04-24 15:15 was a merge. So there must have been two branches before, which had different box remotes with different davcreds.
It would probably help if you can paste those lines as they looked after that merge (omitting most of the davcreds).
Also, I'd like to see the box line from the 11:05 commit.
"""]]