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 linkrev nodeid p1 p2 |
38 rev linkrev nodeid p1-nodeid p2-nodeid |
39 0 2 d35118874825 000000000000 000000000000 |
39 0 2 d35118874825 000000000000 000000000000 |
40 1 3 5345f5ab8abd 000000000000 d35118874825 |
40 1 3 5345f5ab8abd 000000000000 d35118874825 |
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 linkrev nodeid p1 p2 |
46 rev linkrev nodeid p1-nodeid p2-nodeid |
47 0 0 690b295714ae 000000000000 000000000000 |
47 0 0 690b295714ae 000000000000 000000000000 |
48 1 1 9e25c27b8757 690b295714ae 000000000000 |
48 1 1 9e25c27b8757 690b295714ae 000000000000 |
49 |
49 |
50 |
50 |
51 Revert the content change from rev 2: |
51 Revert the content change from rev 2: |
85 line2 |
85 line2 |
86 |
86 |
87 $ hg ci -m '5: merge' |
87 $ hg ci -m '5: merge' |
88 |
88 |
89 $ hg debugindex bar |
89 $ hg debugindex bar |
90 rev linkrev nodeid p1 p2 |
90 rev linkrev nodeid p1-nodeid p2-nodeid |
91 0 2 d35118874825 000000000000 000000000000 |
91 0 2 d35118874825 000000000000 000000000000 |
92 1 3 5345f5ab8abd 000000000000 d35118874825 |
92 1 3 5345f5ab8abd 000000000000 d35118874825 |
93 2 4 ff4b45017382 d35118874825 000000000000 |
93 2 4 ff4b45017382 d35118874825 000000000000 |
94 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
94 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
95 |
95 |
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 linkrev nodeid p1 p2 |
125 rev linkrev nodeid p1-nodeid p2-nodeid |
126 0 2 d35118874825 000000000000 000000000000 |
126 0 2 d35118874825 000000000000 000000000000 |
127 1 3 5345f5ab8abd 000000000000 d35118874825 |
127 1 3 5345f5ab8abd 000000000000 d35118874825 |
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 linkrev nodeid p1 p2 |
133 rev linkrev nodeid p1-nodeid p2-nodeid |
134 0 0 690b295714ae 000000000000 000000000000 |
134 0 0 690b295714ae 000000000000 000000000000 |
135 1 1 9e25c27b8757 690b295714ae 000000000000 |
135 1 1 9e25c27b8757 690b295714ae 000000000000 |
136 |
136 |
137 |
137 |
138 Revert the content change from rev 2: |
138 Revert the content change from rev 2: |
172 line2 |
172 line2 |
173 |
173 |
174 $ hg ci -m '5: merge' |
174 $ hg ci -m '5: merge' |
175 |
175 |
176 $ hg debugindex bar |
176 $ hg debugindex bar |
177 rev linkrev nodeid p1 p2 |
177 rev linkrev nodeid p1-nodeid p2-nodeid |
178 0 2 d35118874825 000000000000 000000000000 |
178 0 2 d35118874825 000000000000 000000000000 |
179 1 3 5345f5ab8abd 000000000000 d35118874825 |
179 1 3 5345f5ab8abd 000000000000 d35118874825 |
180 2 4 ff4b45017382 d35118874825 000000000000 |
180 2 4 ff4b45017382 d35118874825 000000000000 |
181 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
181 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
182 |
182 |