Added a comment
This commit is contained in:
parent
920cdb68e2
commit
335eeb6f9a
1 changed files with 41 additions and 0 deletions
|
@ -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.
|
||||
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue