diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg <Tim@web> | 2013-11-14 16:18:42 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-11-14 16:18:42 +0000 |
| commit | 628869f099fde9193a71047a7be01cfcf268c150 (patch) | |
| tree | 6236d4054a0d6dbf569e05c2c474d0b1c1cb0bf5 /doc/bugs | |
| parent | 2f5f9db09cb89613cd16e45a56a8fd81929b2c39 (diff) | |
Diffstat (limited to 'doc/bugs')
| -rw-r--r-- | doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn index 987d8a8fc..db9a64959 100644 --- a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn +++ b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn @@ -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. Result: file is deleted on both side. + Expected: B.f is gone, A.f is still present ### What steps will reproduce the problem? -// setting up stuff +[[!format sh """ +# setting up stuff test/a$ git init test/a$ git annex init test/a$ git annex direct @@ -18,7 +20,7 @@ $ git clone test/a $ mv a test/b test/b$ git annex direct -// actual scenario +# actual scenario test/b$ echo bbbb > f test/b$ git annex add f test/b$ git annex sync @@ -29,7 +31,8 @@ test/a$ git annex sync test/b$ rm f test/b$ 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? git-annex version: 4.20131031-g7d99d14 |