diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg <Tim@web> | 2013-10-13 09:04:52 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-10-13 09:04:52 +0000 |
| commit | add9fd8602adfa8f4214210deaaefea60fc301b0 (patch) | |
| tree | c868b7bfebb3d0296dacd5a3c6e615c5550e2391 /doc | |
| parent | 15e271b9772a71661f462049a284c6fa14848404 (diff) | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn index 245def940..69364ae63 100644 --- a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn +++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn @@ -1,13 +1,16 @@ ### Please describe the problem. -Data loss due to incorrect merge of repos in direct mode. +Data loss due to incorrect merge of repos in direct mode. (I tested the same scenario in indirect mode and it worked fine there) Given 2 repos A and B, in direct mode: + 1. in A: mkdir f, with a file f in it 2. in B: touch f 3. in B: sync Result: Only an f.variant-f###remains, which is file f of B, and the merge conflict has already been automatically resolved. I.e. Directory f containing file f, is lost. +Expected result: remaining contents: f.variant-AAA which is file f of B, f.variant-BBB which is directory f of A, containing a file f. Merge conflict marked resolved. + ### What steps will reproduce the problem? Execute the script given below in additional information. |