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

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg 2013-11-14 16:18:42 +00:00 • committed by admin
parent ba8031a314
commit 467d576560
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn
View file

@ -4,11 +4,13 @@ Minor issue.
Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted. Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted.
Result: file is deleted on both side. Result: file is deleted on both side.
Expected: B.f is gone, A.f is still present Expected: B.f is gone, A.f is still present
### What steps will reproduce the problem? ### What steps will reproduce the problem?
// setting up stuff [[!format sh """
# setting up stuff
test/a$ git init test/a$ git init
test/a$ git annex init test/a$ git annex init
test/a$ git annex direct test/a$ git annex direct
@ -18,7 +20,7 @@ $ git clone test/a
$ mv a test/b $ mv a test/b
test/b$ git annex direct test/b$ git annex direct
// actual scenario # actual scenario
test/b$ echo bbbb > f test/b$ echo bbbb > f
test/b$ git annex add f test/b$ git annex add f
test/b$ git annex sync test/b$ git annex sync
@ -29,7 +31,8 @@ test/a$ git annex sync
test/b$ rm f test/b$ rm f
test/b$ git annex sync test/b$ git annex sync
test/a$ git annex sync test/a$ git annex sync
// test/a/f is now gone, lost # test/a/f is now gone, lost
"""]]
### What version of git-annex are you using? On what operating system? ### What version of git-annex are you using? On what operating system?
git-annex version: 4.20131031-g7d99d14 git-annex version: 4.20131031-g7d99d14