Show More
@@ -23,10 +23,11 b' use git diff to see rename' | |||||
23 |
|
23 | |||
24 | Add some linear rename initialy |
|
24 | Add some linear rename initialy | |
25 |
|
25 | |||
26 | $ touch a b |
|
26 | $ touch a b h | |
27 | $ hg ci -Am 'i-0 initial commit: a b' |
|
27 | $ hg ci -Am 'i-0 initial commit: a b h' | |
28 | adding a |
|
28 | adding a | |
29 | adding b |
|
29 | adding b | |
|
30 | adding h | |||
30 | $ hg mv a c |
|
31 | $ hg mv a c | |
31 | $ hg ci -Am 'i-1: a -move-> c' |
|
32 | $ hg ci -Am 'i-1: a -move-> c' | |
32 | $ hg mv c d |
|
33 | $ hg mv c d | |
@@ -36,7 +37,7 b' Add some linear rename initialy' | |||||
36 | | |
|
37 | | | |
37 | o 1 i-1: a -move-> c] |
|
38 | o 1 i-1: a -move-> c] | |
38 | | |
|
39 | | | |
39 | o 0 i-0 initial commit: a b] |
|
40 | o 0 i-0 initial commit: a b h] | |
40 |
|
41 | |||
41 |
|
42 | |||
42 | And having another branch with renames on the other side |
|
43 | And having another branch with renames on the other side | |
@@ -54,7 +55,7 b' And having another branch with renames o' | |||||
54 | | |
|
55 | | | |
55 | o 1 i-1: a -move-> c] |
|
56 | o 1 i-1: a -move-> c] | |
56 | | |
|
57 | | | |
57 | o 0 i-0 initial commit: a b] |
|
58 | o 0 i-0 initial commit: a b h] | |
58 |
|
59 | |||
59 |
|
60 | |||
60 | Have a branching with nothing on one side |
|
61 | Have a branching with nothing on one side | |
@@ -71,7 +72,7 b' Have a branching with nothing on one sid' | |||||
71 | | |
|
72 | | | |
72 | o 1 i-1: a -move-> c] |
|
73 | o 1 i-1: a -move-> c] | |
73 | | |
|
74 | | | |
74 | o 0 i-0 initial commit: a b] |
|
75 | o 0 i-0 initial commit: a b h] | |
75 |
|
76 | |||
76 |
|
77 | |||
77 |
|
78 | |||
@@ -107,7 +108,7 b' Merge the two branches we just defined (' | |||||
107 | | |
|
108 | | | |
108 | o 1 i-1: a -move-> c] |
|
109 | o 1 i-1: a -move-> c] | |
109 | | |
|
110 | | | |
110 | o 0 i-0 initial commit: a b] |
|
111 | o 0 i-0 initial commit: a b h] | |
111 |
|
112 | |||
112 |
|
113 | |||
113 | Create a branch that delete a file previous renamed |
|
114 | Create a branch that delete a file previous renamed | |
@@ -124,7 +125,7 b' Create a branch that delete a file previ' | |||||
124 | | |
|
125 | | | |
125 | o 1 i-1: a -move-> c] |
|
126 | o 1 i-1: a -move-> c] | |
126 | | |
|
127 | | | |
127 | o 0 i-0 initial commit: a b] |
|
128 | o 0 i-0 initial commit: a b h] | |
128 |
|
129 | |||
129 |
|
130 | |||
130 | Merge: |
|
131 | Merge: | |
@@ -168,7 +169,7 b' and recreate an unrelated file after the' | |||||
168 | | |
|
169 | | | |
169 | o 1 i-1: a -move-> c] |
|
170 | o 1 i-1: a -move-> c] | |
170 | | |
|
171 | | | |
171 | o 0 i-0 initial commit: a b] |
|
172 | o 0 i-0 initial commit: a b h] | |
172 |
|
173 | |||
173 |
|
174 | |||
174 | Create a branch that delete a file previous renamed and recreate it |
|
175 | Create a branch that delete a file previous renamed and recreate it | |
@@ -190,7 +191,7 b' Create a branch that delete a file previ' | |||||
190 | | |
|
191 | | | |
191 | o 1 i-1: a -move-> c] |
|
192 | o 1 i-1: a -move-> c] | |
192 | | |
|
193 | | | |
193 | o 0 i-0 initial commit: a b] |
|
194 | o 0 i-0 initial commit: a b h] | |
194 |
|
195 | |||
195 |
|
196 | |||
196 | Merge: |
|
197 | Merge: | |
@@ -232,7 +233,7 b' Note:' | |||||
232 | | |
|
233 | | | |
233 | o 1 i-1: a -move-> c] |
|
234 | o 1 i-1: a -move-> c] | |
234 | | |
|
235 | | | |
235 | o 0 i-0 initial commit: a b] |
|
236 | o 0 i-0 initial commit: a b h] | |
236 |
|
237 | |||
237 |
|
238 | |||
238 | Having another branch renaming a different file to the same filename as another |
|
239 | Having another branch renaming a different file to the same filename as another | |
@@ -253,7 +254,7 b' Having another branch renaming a differe' | |||||
253 | | |
|
254 | | | |
254 | o 1 i-1: a -move-> c] |
|
255 | o 1 i-1: a -move-> c] | |
255 | | |
|
256 | | | |
256 | o 0 i-0 initial commit: a b] |
|
257 | o 0 i-0 initial commit: a b h] | |
257 |
|
258 | |||
258 |
|
259 | |||
259 | Merge: |
|
260 | Merge: | |
@@ -290,7 +291,7 b' Merge:' | |||||
290 | | |
|
291 | | | |
291 | o 1 i-1: a -move-> c] |
|
292 | o 1 i-1: a -move-> c] | |
292 | | |
|
293 | | | |
293 | o 0 i-0 initial commit: a b] |
|
294 | o 0 i-0 initial commit: a b h] | |
294 |
|
295 | |||
295 |
|
296 | |||
296 | Note: |
|
297 | Note: | |
@@ -459,7 +460,7 b' not a merge.' | |||||
459 | | |
|
460 | | | |
460 | o 1 i-1: a -move-> c] |
|
461 | o 1 i-1: a -move-> c] | |
461 | | |
|
462 | | | |
462 | o 0 i-0 initial commit: a b] |
|
463 | o 0 i-0 initial commit: a b h] | |
463 |
|
464 | |||
464 |
|
465 | |||
465 | This `hg log` output is correct |
|
466 | This `hg log` output is correct |
General Comments 0
You need to be logged in to leave comments.
Login now