Show More
@@ -706,8 +706,8 b' class localrepository(repo.repository):' | |||||
706 | nfp = fp2 |
|
706 | nfp = fp2 | |
707 |
|
707 | |||
708 | if manifest2: # branch merge |
|
708 | if manifest2: # branch merge | |
709 | if fp2 == nullid: # copied on remote side |
|
709 | if fp2 == nullid or cr is None: # copied on remote side | |
710 |
if |
|
710 | if cf in manifest2: | |
711 | cr = manifest2[cf] |
|
711 | cr = manifest2[cf] | |
712 | nfp = fp1 |
|
712 | nfp = fp1 | |
713 |
|
713 |
@@ -32,3 +32,37 b' hg st' | |||||
32 | echo % rename back c as b |
|
32 | echo % rename back c as b | |
33 | hg mv c b |
|
33 | hg mv c b | |
34 | hg st |
|
34 | hg st | |
|
35 | cd .. | |||
|
36 | ||||
|
37 | # Test issue 1476: renaming a first parent file into | |||
|
38 | # another first parent file while none of them belong to | |||
|
39 | # the second parent was broken | |||
|
40 | echo % test issue 1476 | |||
|
41 | hg init repo1476 | |||
|
42 | cd repo1476 | |||
|
43 | echo a > a | |||
|
44 | hg ci -Am adda | |||
|
45 | echo b1 > b1 | |||
|
46 | echo b2 > b2 | |||
|
47 | hg ci -Am changea | |||
|
48 | hg up -C 0 | |||
|
49 | echo c1 > c1 | |||
|
50 | echo c2 > c2 | |||
|
51 | hg ci -Am addcandd | |||
|
52 | echo % merge heads | |||
|
53 | hg merge | |||
|
54 | hg mv -Af c1 c2 | |||
|
55 | echo % commit issue 1476 | |||
|
56 | hg ci -m merge | |||
|
57 | hg log -r tip -C -v | grep copies | |||
|
58 | hg rollback | |||
|
59 | hg up -C . | |||
|
60 | echo % merge heads again | |||
|
61 | hg merge | |||
|
62 | hg mv -Af b1 b2 | |||
|
63 | echo % commit issue 1476 with a rename on the other side | |||
|
64 | hg ci -m merge | |||
|
65 | hg log -r tip -C -v | grep copies | |||
|
66 | ||||
|
67 | ||||
|
68 |
@@ -21,3 +21,23 b' A c' | |||||
21 | R b |
|
21 | R b | |
22 | % rename back c as b |
|
22 | % rename back c as b | |
23 | M b |
|
23 | M b | |
|
24 | % test issue 1476 | |||
|
25 | adding a | |||
|
26 | adding b1 | |||
|
27 | adding b2 | |||
|
28 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
29 | adding c1 | |||
|
30 | adding c2 | |||
|
31 | created new head | |||
|
32 | % merge heads | |||
|
33 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
34 | (branch merge, don't forget to commit) | |||
|
35 | % commit issue 1476 | |||
|
36 | copies: c2 (c1) | |||
|
37 | rolling back last transaction | |||
|
38 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
39 | % merge heads again | |||
|
40 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
41 | (branch merge, don't forget to commit) | |||
|
42 | % commit issue 1476 with a rename on the other side | |||
|
43 | copies: b2 (b1) |
General Comments 0
You need to be logged in to leave comments.
Login now