##// END OF EJS Templates
copies-tests: remove spurious `]` in the template...
marmoute -
r45153:25d97090 default
parent child Browse files
Show More
@@ -15,7 +15,7 b' use git diff to see rename'
15 15 > [diff]
16 16 > git=yes
17 17 > [ui]
18 > logtemplate={rev} {desc}]\n
18 > logtemplate={rev} {desc}\n
19 19 > EOF
20 20
21 21 $ hg init repo-chain
@@ -33,11 +33,11 b' Add some linear rename initialy'
33 33 $ hg mv c d
34 34 $ hg ci -Am 'i-2: c -move-> d'
35 35 $ hg log -G
36 @ 2 i-2: c -move-> d]
36 @ 2 i-2: c -move-> d
37 37 |
38 o 1 i-1: a -move-> c]
38 o 1 i-1: a -move-> c
39 39 |
40 o 0 i-0 initial commit: a b h]
40 o 0 i-0 initial commit: a b h
41 41
42 42
43 43 And having another branch with renames on the other side
@@ -47,15 +47,15 b' And having another branch with renames o'
47 47 $ hg mv e f
48 48 $ hg ci -Am 'a-2: e -move-> f'
49 49 $ hg log -G --rev '::.'
50 @ 4 a-2: e -move-> f]
50 @ 4 a-2: e -move-> f
51 51 |
52 o 3 a-1: d -move-> e]
52 o 3 a-1: d -move-> e
53 53 |
54 o 2 i-2: c -move-> d]
54 o 2 i-2: c -move-> d
55 55 |
56 o 1 i-1: a -move-> c]
56 o 1 i-1: a -move-> c
57 57 |
58 o 0 i-0 initial commit: a b h]
58 o 0 i-0 initial commit: a b h
59 59
60 60
61 61 Have a branching with nothing on one side
@@ -66,13 +66,13 b' Have a branching with nothing on one sid'
66 66 $ hg ci -m 'b-1: b update'
67 67 created new head
68 68 $ hg log -G --rev '::.'
69 @ 5 b-1: b update]
69 @ 5 b-1: b update
70 70 |
71 o 2 i-2: c -move-> d]
71 o 2 i-2: c -move-> d
72 72 |
73 o 1 i-1: a -move-> c]
73 o 1 i-1: a -move-> c
74 74 |
75 o 0 i-0 initial commit: a b h]
75 o 0 i-0 initial commit: a b h
76 76
77 77
78 78
@@ -94,21 +94,21 b' Merge the two branches we just defined ('
94 94 $ hg ci -m 'mABm-0 simple merge - the other way'
95 95 created new head
96 96 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
97 @ 7 mABm-0 simple merge - the other way]
97 @ 7 mABm-0 simple merge - the other way
98 98 |\
99 +---o 6 mBAm-0 simple merge - one way]
99 +---o 6 mBAm-0 simple merge - one way
100 100 | |/
101 | o 5 b-1: b update]
101 | o 5 b-1: b update
102 102 | |
103 o | 4 a-2: e -move-> f]
103 o | 4 a-2: e -move-> f
104 104 | |
105 o | 3 a-1: d -move-> e]
105 o | 3 a-1: d -move-> e
106 106 |/
107 o 2 i-2: c -move-> d]
107 o 2 i-2: c -move-> d
108 108 |
109 o 1 i-1: a -move-> c]
109 o 1 i-1: a -move-> c
110 110 |
111 o 0 i-0 initial commit: a b h]
111 o 0 i-0 initial commit: a b h
112 112
113 113
114 114 Create a branch that delete a file previous renamed
@@ -119,13 +119,13 b' Create a branch that delete a file previ'
119 119 $ hg ci -m 'c-1 delete d'
120 120 created new head
121 121 $ hg log -G --rev '::.'
122 @ 8 c-1 delete d]
122 @ 8 c-1 delete d
123 123 |
124 o 2 i-2: c -move-> d]
124 o 2 i-2: c -move-> d
125 125 |
126 o 1 i-1: a -move-> c]
126 o 1 i-1: a -move-> c
127 127 |
128 o 0 i-0 initial commit: a b h]
128 o 0 i-0 initial commit: a b h
129 129
130 130
131 131 Merge:
@@ -153,23 +153,23 b' and recreate an unrelated file after the'
153 153 $ hg add d
154 154 $ hg ci -m 'mCBm-1 re-add d'
155 155 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
156 @ 12 mCBm-1 re-add d]
156 @ 12 mCBm-1 re-add d
157 157 |
158 o 11 mCBm-0 simple merge - the other way]
158 o 11 mCBm-0 simple merge - the other way
159 159 |\
160 | | o 10 mBCm-1 re-add d]
160 | | o 10 mBCm-1 re-add d
161 161 | | |
162 +---o 9 mBCm-0 simple merge - one way]
162 +---o 9 mBCm-0 simple merge - one way
163 163 | |/
164 | o 8 c-1 delete d]
164 | o 8 c-1 delete d
165 165 | |
166 o | 5 b-1: b update]
166 o | 5 b-1: b update
167 167 |/
168 o 2 i-2: c -move-> d]
168 o 2 i-2: c -move-> d
169 169 |
170 o 1 i-1: a -move-> c]
170 o 1 i-1: a -move-> c
171 171 |
172 o 0 i-0 initial commit: a b h]
172 o 0 i-0 initial commit: a b h
173 173
174 174
175 175 Create a branch that delete a file previous renamed and recreate it
@@ -183,15 +183,15 b' Create a branch that delete a file previ'
183 183 $ hg add d
184 184 $ hg ci -m 'd-2 re-add d'
185 185 $ hg log -G --rev '::.'
186 @ 14 d-2 re-add d]
186 @ 14 d-2 re-add d
187 187 |
188 o 13 d-1 delete d]
188 o 13 d-1 delete d
189 189 |
190 o 2 i-2: c -move-> d]
190 o 2 i-2: c -move-> d
191 191 |
192 o 1 i-1: a -move-> c]
192 o 1 i-1: a -move-> c
193 193 |
194 o 0 i-0 initial commit: a b h]
194 o 0 i-0 initial commit: a b h
195 195
196 196
197 197 Merge:
@@ -219,21 +219,21 b' Note:'
219 219 $ hg ci -m 'mDBm-0 simple merge - the other way'
220 220 created new head
221 221 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
222 @ 16 mDBm-0 simple merge - the other way]
222 @ 16 mDBm-0 simple merge - the other way
223 223 |\
224 +---o 15 mBDm-0 simple merge - one way]
224 +---o 15 mBDm-0 simple merge - one way
225 225 | |/
226 | o 14 d-2 re-add d]
226 | o 14 d-2 re-add d
227 227 | |
228 | o 13 d-1 delete d]
228 | o 13 d-1 delete d
229 229 | |
230 o | 5 b-1: b update]
230 o | 5 b-1: b update
231 231 |/
232 o 2 i-2: c -move-> d]
232 o 2 i-2: c -move-> d
233 233 |
234 o 1 i-1: a -move-> c]
234 o 1 i-1: a -move-> c
235 235 |
236 o 0 i-0 initial commit: a b h]
236 o 0 i-0 initial commit: a b h
237 237
238 238
239 239 Having another branch renaming a different file to the same filename as another
@@ -246,15 +246,15 b' Having another branch renaming a differe'
246 246 $ hg mv g f
247 247 $ hg ci -m 'e-2 g -move-> f'
248 248 $ hg log -G --rev '::.'
249 @ 18 e-2 g -move-> f]
249 @ 18 e-2 g -move-> f
250 250 |
251 o 17 e-1 b -move-> g]
251 o 17 e-1 b -move-> g
252 252 |
253 o 2 i-2: c -move-> d]
253 o 2 i-2: c -move-> d
254 254 |
255 o 1 i-1: a -move-> c]
255 o 1 i-1: a -move-> c
256 256 |
257 o 0 i-0 initial commit: a b h]
257 o 0 i-0 initial commit: a b h
258 258
259 259
260 260 Merge:
@@ -275,23 +275,23 b' Merge:'
275 275 $ hg ci -m 'mEAm-0 simple merge - the other way'
276 276 created new head
277 277 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
278 @ 20 mEAm-0 simple merge - the other way]
278 @ 20 mEAm-0 simple merge - the other way
279 279 |\
280 +---o 19 mAEm-0 simple merge - one way]
280 +---o 19 mAEm-0 simple merge - one way
281 281 | |/
282 | o 18 e-2 g -move-> f]
282 | o 18 e-2 g -move-> f
283 283 | |
284 | o 17 e-1 b -move-> g]
284 | o 17 e-1 b -move-> g
285 285 | |
286 o | 4 a-2: e -move-> f]
286 o | 4 a-2: e -move-> f
287 287 | |
288 o | 3 a-1: d -move-> e]
288 o | 3 a-1: d -move-> e
289 289 |/
290 o 2 i-2: c -move-> d]
290 o 2 i-2: c -move-> d
291 291 |
292 o 1 i-1: a -move-> c]
292 o 1 i-1: a -move-> c
293 293 |
294 o 0 i-0 initial commit: a b h]
294 o 0 i-0 initial commit: a b h
295 295
296 296
297 297 Note:
@@ -330,21 +330,21 b' Merge:'
330 330 $ hg ci -m 'mFBm-0 simple merge - the other way'
331 331 created new head
332 332 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
333 @ 24 mFBm-0 simple merge - the other way]
333 @ 24 mFBm-0 simple merge - the other way
334 334 |\
335 +---o 23 mBFm-0 simple merge - one way]
335 +---o 23 mBFm-0 simple merge - one way
336 336 | |/
337 | o 22 f-2: rename i -> d]
337 | o 22 f-2: rename i -> d
338 338 | |
339 | o 21 f-1: rename h -> i]
339 | o 21 f-1: rename h -> i
340 340 | |
341 o | 5 b-1: b update]
341 o | 5 b-1: b update
342 342 |/
343 o 2 i-2: c -move-> d]
343 o 2 i-2: c -move-> d
344 344 |
345 o 1 i-1: a -move-> c]
345 o 1 i-1: a -move-> c
346 346 |
347 o 0 i-0 initial commit: a b h]
347 o 0 i-0 initial commit: a b h
348 348
349 349
350 350 Merge:
@@ -372,21 +372,21 b' Merge:'
372 372 $ hg ci -m 'mGDm-0 simple merge - the other way'
373 373 created new head
374 374 $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
375 @ 27 mGDm-0 simple merge - the other way]
375 @ 27 mGDm-0 simple merge - the other way
376 376 |\
377 +---o 26 mDGm-0 simple merge - one way]
377 +---o 26 mDGm-0 simple merge - one way
378 378 | |/
379 | o 25 g-1: update d]
379 | o 25 g-1: update d
380 380 | |
381 o | 14 d-2 re-add d]
381 o | 14 d-2 re-add d
382 382 | |
383 o | 13 d-1 delete d]
383 o | 13 d-1 delete d
384 384 |/
385 o 2 i-2: c -move-> d]
385 o 2 i-2: c -move-> d
386 386 |
387 o 1 i-1: a -move-> c]
387 o 1 i-1: a -move-> c
388 388 |
389 o 0 i-0 initial commit: a b h]
389 o 0 i-0 initial commit: a b h
390 390
391 391
392 392
@@ -411,21 +411,21 b' Merge:'
411 411 $ hg ci -m 'mGFm-0 simple merge - the other way'
412 412 created new head
413 413 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
414 @ 29 mGFm-0 simple merge - the other way]
414 @ 29 mGFm-0 simple merge - the other way
415 415 |\
416 +---o 28 mFGm-0 simple merge - one way]
416 +---o 28 mFGm-0 simple merge - one way
417 417 | |/
418 | o 25 g-1: update d]
418 | o 25 g-1: update d
419 419 | |
420 o | 22 f-2: rename i -> d]
420 o | 22 f-2: rename i -> d
421 421 | |
422 o | 21 f-1: rename h -> i]
422 o | 21 f-1: rename h -> i
423 423 |/
424 o 2 i-2: c -move-> d]
424 o 2 i-2: c -move-> d
425 425 |
426 o 1 i-1: a -move-> c]
426 o 1 i-1: a -move-> c
427 427 |
428 o 0 i-0 initial commit: a b h]
428 o 0 i-0 initial commit: a b h
429 429
430 430
431 431
@@ -588,21 +588,21 b' not a merge.'
588 588 (This `hg log` output if wrong, since no merge actually happened).
589 589
590 590 $ hg log -Gfr 'desc("mBDm-0")' d
591 o 15 mBDm-0 simple merge - one way]
591 o 15 mBDm-0 simple merge - one way
592 592 |\
593 o : 14 d-2 re-add d]
593 o : 14 d-2 re-add d
594 594 :/
595 o 2 i-2: c -move-> d]
595 o 2 i-2: c -move-> d
596 596 |
597 o 1 i-1: a -move-> c]
597 o 1 i-1: a -move-> c
598 598 |
599 o 0 i-0 initial commit: a b h]
599 o 0 i-0 initial commit: a b h
600 600
601 601
602 602 This `hg log` output is correct
603 603
604 604 $ hg log -Gfr 'desc("mDBm-0")' d
605 o 14 d-2 re-add d]
605 o 14 d-2 re-add d
606 606 |
607 607 ~
608 608
@@ -718,27 +718,27 b' The overwriting should take over. Howeve'
718 718 The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear.
719 719
720 720 $ hg log -Gfr 'desc("mBFm-0")' d
721 o 23 mBFm-0 simple merge - one way]
721 o 23 mBFm-0 simple merge - one way
722 722 |\
723 o : 22 f-2: rename i -> d]
723 o : 22 f-2: rename i -> d
724 724 | :
725 o : 21 f-1: rename h -> i]
725 o : 21 f-1: rename h -> i
726 726 :/
727 o 2 i-2: c -move-> d]
727 o 2 i-2: c -move-> d
728 728 |
729 o 1 i-1: a -move-> c]
729 o 1 i-1: a -move-> c
730 730 |
731 o 0 i-0 initial commit: a b h]
731 o 0 i-0 initial commit: a b h
732 732
733 733
734 734 The following output is correct.
735 735
736 736 $ hg log -Gfr 'desc("mFBm-0")' d
737 o 22 f-2: rename i -> d]
737 o 22 f-2: rename i -> d
738 738 |
739 o 21 f-1: rename h -> i]
739 o 21 f-1: rename h -> i
740 740 :
741 o 0 i-0 initial commit: a b h]
741 o 0 i-0 initial commit: a b h
742 742
743 743
744 744 Merge:
@@ -766,32 +766,32 b' consider history and rename on both bran'
766 766 M d
767 767
768 768 $ hg log -Gfr 'desc("mDGm-0")' d
769 o 26 mDGm-0 simple merge - one way]
769 o 26 mDGm-0 simple merge - one way
770 770 |\
771 | o 25 g-1: update d]
771 | o 25 g-1: update d
772 772 | |
773 o | 14 d-2 re-add d]
773 o | 14 d-2 re-add d
774 774 |/
775 o 2 i-2: c -move-> d]
775 o 2 i-2: c -move-> d
776 776 |
777 o 1 i-1: a -move-> c]
777 o 1 i-1: a -move-> c
778 778 |
779 o 0 i-0 initial commit: a b h]
779 o 0 i-0 initial commit: a b h
780 780
781 781
782 782
783 783 $ hg log -Gfr 'desc("mDGm-0")' d
784 o 26 mDGm-0 simple merge - one way]
784 o 26 mDGm-0 simple merge - one way
785 785 |\
786 | o 25 g-1: update d]
786 | o 25 g-1: update d
787 787 | |
788 o | 14 d-2 re-add d]
788 o | 14 d-2 re-add d
789 789 |/
790 o 2 i-2: c -move-> d]
790 o 2 i-2: c -move-> d
791 791 |
792 o 1 i-1: a -move-> c]
792 o 1 i-1: a -move-> c
793 793 |
794 o 0 i-0 initial commit: a b h]
794 o 0 i-0 initial commit: a b h
795 795
796 796
797 797
@@ -836,34 +836,34 b' Note:'
836 836 R h
837 837
838 838 $ hg log -Gfr 'desc("mFGm-0")' d
839 o 28 mFGm-0 simple merge - one way]
839 o 28 mFGm-0 simple merge - one way
840 840 |\
841 | o 25 g-1: update d]
841 | o 25 g-1: update d
842 842 | |
843 o | 22 f-2: rename i -> d]
843 o | 22 f-2: rename i -> d
844 844 | |
845 o | 21 f-1: rename h -> i]
845 o | 21 f-1: rename h -> i
846 846 |/
847 o 2 i-2: c -move-> d]
847 o 2 i-2: c -move-> d
848 848 |
849 o 1 i-1: a -move-> c]
849 o 1 i-1: a -move-> c
850 850 |
851 o 0 i-0 initial commit: a b h]
851 o 0 i-0 initial commit: a b h
852 852
853 853
854 854
855 855 $ hg log -Gfr 'desc("mGFm-0")' d
856 @ 29 mGFm-0 simple merge - the other way]
856 @ 29 mGFm-0 simple merge - the other way
857 857 |\
858 | o 25 g-1: update d]
858 | o 25 g-1: update d
859 859 | |
860 o | 22 f-2: rename i -> d]
860 o | 22 f-2: rename i -> d
861 861 | |
862 o | 21 f-1: rename h -> i]
862 o | 21 f-1: rename h -> i
863 863 |/
864 o 2 i-2: c -move-> d]
864 o 2 i-2: c -move-> d
865 865 |
866 o 1 i-1: a -move-> c]
866 o 1 i-1: a -move-> c
867 867 |
868 o 0 i-0 initial commit: a b h]
868 o 0 i-0 initial commit: a b h
869 869
General Comments 0
You need to be logged in to leave comments. Login now