|
1 # Test issue 746: renaming files brought by the |
|
2 # second parent of a merge was broken. |
|
3 |
|
4 Create source repository: |
|
5 |
|
6 $ hg init t |
|
7 $ cd t |
|
8 $ echo a > a |
|
9 $ hg ci -Am a |
|
10 adding a |
|
11 $ cd .. |
|
12 |
|
13 Fork source repository: |
|
14 |
|
15 $ hg clone t t2 |
|
16 updating to branch default |
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 $ cd t2 |
|
19 $ echo b > b |
|
20 $ hg ci -Am b |
|
21 adding b |
|
22 |
|
23 Update source repository: |
|
24 |
|
25 $ cd ../t |
|
26 $ echo a >> a |
|
27 $ hg ci -m a2 |
|
28 |
|
29 Merge repositories: |
|
30 |
|
31 $ hg pull ../t2 |
|
32 pulling from ../t2 |
|
33 searching for changes |
|
34 adding changesets |
|
35 adding manifests |
|
36 adding file changes |
|
37 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
38 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
39 |
|
40 $ hg merge |
|
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 (branch merge, don't forget to commit) |
|
43 |
|
44 $ hg st |
|
45 M b |
|
46 |
|
47 Rename b as c: |
|
48 |
|
49 $ hg mv b c |
|
50 $ hg st |
|
51 A c |
|
52 R b |
|
53 |
|
54 Rename back c as b: |
|
55 |
|
56 $ hg mv c b |
|
57 $ hg st |
|
58 M b |
|
59 |
|
60 $ cd .. |
|
61 |
|
62 # Test issue 1476: renaming a first parent file into |
|
63 # another first parent file while none of them belong to |
|
64 # the second parent was broken |
|
65 |
|
66 $ hg init repo1476 |
|
67 $ cd repo1476 |
|
68 $ echo a > a |
|
69 $ hg ci -Am adda |
|
70 adding a |
|
71 $ echo b1 > b1 |
|
72 $ echo b2 > b2 |
|
73 $ hg ci -Am changea |
|
74 adding b1 |
|
75 adding b2 |
|
76 $ hg up -C 0 |
|
77 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
78 $ echo c1 > c1 |
|
79 $ echo c2 > c2 |
|
80 $ hg ci -Am addcandd |
|
81 adding c1 |
|
82 adding c2 |
|
83 created new head |
|
84 |
|
85 Merge heads: |
|
86 |
|
87 $ hg merge |
|
88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 (branch merge, don't forget to commit) |
|
90 |
|
91 $ hg mv -Af c1 c2 |
|
92 |
|
93 Commit issue 1476: |
|
94 |
|
95 $ hg ci -m merge |
|
96 |
|
97 $ hg log -r tip -C -v | grep copies |
|
98 copies: c2 (c1) |
|
99 |
|
100 $ hg rollback |
|
101 rolling back to revision 2 (undo commit) |
|
102 |
|
103 $ hg up -C . |
|
104 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
105 |
|
106 Merge heads again: |
|
107 |
|
108 $ hg merge |
|
109 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
110 (branch merge, don't forget to commit) |
|
111 |
|
112 $ hg mv -Af b1 b2 |
|
113 |
|
114 Commit issue 1476 with a rename on the other side: |
|
115 |
|
116 $ hg ci -m merge |
|
117 |
|
118 $ hg log -r tip -C -v | grep copies |
|
119 copies: b2 (b1) |
|
120 |