equal
deleted
inserted
replaced
33 line2 |
33 line2 |
34 |
34 |
35 $ hg ci -m '3: merge with local rename' |
35 $ hg ci -m '3: merge with local rename' |
36 |
36 |
37 $ hg debugindex bar |
37 $ hg debugindex bar |
38 rev offset length base linkrev nodeid p1 p2 |
38 rev offset length ..... linkrev nodeid p1 p2 (re) |
39 0 0 77 0 2 d35118874825 000000000000 000000000000 |
39 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) |
40 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
40 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) |
41 |
41 |
42 $ hg debugrename bar |
42 $ hg debugrename bar |
43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
44 |
44 |
45 $ hg debugindex foo |
45 $ hg debugindex foo |
46 rev offset length base linkrev nodeid p1 p2 |
46 rev offset length ..... linkrev nodeid p1 p2 (re) |
47 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
47 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) |
48 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
48 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) |
49 |
49 |
50 |
50 |
51 Revert the content change from rev 2: |
51 Revert the content change from rev 2: |
52 |
52 |
53 $ hg up -C 2 |
53 $ hg up -C 2 |
86 line2 |
86 line2 |
87 |
87 |
88 $ hg ci -m '5: merge' |
88 $ hg ci -m '5: merge' |
89 |
89 |
90 $ hg debugindex bar |
90 $ hg debugindex bar |
91 rev offset length base linkrev nodeid p1 p2 |
91 rev offset length ..... linkrev nodeid p1 p2 (re) |
92 0 0 77 0 2 d35118874825 000000000000 000000000000 |
92 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) |
93 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
93 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) |
94 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 |
94 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) |
95 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
95 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) |
96 |
96 |
97 |
97 |
98 Same thing, but with the merge on 3 having the rename |
98 Same thing, but with the merge on 3 having the rename |
99 on the remote parent: |
99 on the remote parent: |
100 |
100 |
120 line2 |
120 line2 |
121 |
121 |
122 $ hg ci -m '3: merge with remote rename' |
122 $ hg ci -m '3: merge with remote rename' |
123 |
123 |
124 $ hg debugindex bar |
124 $ hg debugindex bar |
125 rev offset length base linkrev nodeid p1 p2 |
125 rev offset length ..... linkrev nodeid p1 p2 (re) |
126 0 0 77 0 2 d35118874825 000000000000 000000000000 |
126 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) |
127 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
127 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) |
128 |
128 |
129 $ hg debugrename bar |
129 $ hg debugrename bar |
130 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
130 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
131 |
131 |
132 $ hg debugindex foo |
132 $ hg debugindex foo |
133 rev offset length base linkrev nodeid p1 p2 |
133 rev offset length ..... linkrev nodeid p1 p2 (re) |
134 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
134 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) |
135 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
135 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) |
136 |
136 |
137 |
137 |
138 Revert the content change from rev 2: |
138 Revert the content change from rev 2: |
139 |
139 |
140 $ hg up -C 2 |
140 $ hg up -C 2 |
173 line2 |
173 line2 |
174 |
174 |
175 $ hg ci -m '5: merge' |
175 $ hg ci -m '5: merge' |
176 |
176 |
177 $ hg debugindex bar |
177 $ hg debugindex bar |
178 rev offset length base linkrev nodeid p1 p2 |
178 rev offset length ..... linkrev nodeid p1 p2 (re) |
179 0 0 77 0 2 d35118874825 000000000000 000000000000 |
179 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) |
180 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
180 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) |
181 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 |
181 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) |
182 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
182 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) |
183 |
183 |
184 $ cd .. |
184 $ cd .. |