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

Added a comment

Browse source
This commit is contained in:
http://joeyh.name/ 2013-11-14 17:10:55 +00:00 • committed by admin
parent 920cdb68e2
commit 335eeb6f9a
1 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

41
doc/bugs/Incorrect_merge___40__a_special_case__41__/comment_1_c80418d76b501c688e3a9fb4831520fd._comment Normal file
View file

@ -0,0 +1,41 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.246"
subject="comment 1"
date="2013-11-14T17:10:55Z"
content="""
I suspect this might be the same underlying problem as [[bugs/Incorrect merge, direct repos (2)]]. However, I cannot reproduce it using the recipe given.. perhaps something was left out?
I wrote this shell script to try to codify the recipe in a runnable form:
[[!format sh \"\"\"
#!/bin/sh
set -e
mkdir test
cd test
git init a
cd a
git annex init
git annex direct
touch firstfile
git annex add firstfile
git annex sync # think this was left out of recipe
cd ..
git clone a b
cd b
git annex direct
echo bbbb > f
git annex add f
git annex sync || true
cd ..
cd a
echo aaaa > f
git annex add f
git annex sync
\"\"\"]]
At this point, a has 2 variants of f, and no amount of syncing in either repo will cause either variant to go away.
"""]]