This commit is contained in:
parent
1d4f1d5170
commit
8c41f6a7dd
1 changed files with 4 additions and 1 deletions
|
@ -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.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue