Mercurial > hg

comparison tests/test-mv-cp-st-diff.out @ 6336:4b0c9c674707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn about new heads on commit (issue842)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 21 Mar 2008 11:06:02 +0100
parents 90a4329a6b4a
children 2d9328a2f81f
comparison
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707
1 created new head
1 ** rename in working dir ** 2 ** rename in working dir **
2 ** add a a1 / add a a2 / hg mv a b 3 ** add a a1 / add a a2 / hg mv a b
3 - working to parent: 4 - working to parent:
4 A b 5 A b
5 a 6 a
94 -a2 95 -a2
95 +m1 96 +m1
96 +m2 97 +m2
97 98
98 99
100 created new head
99 ** copy in working dir ** 101 ** copy in working dir **
100 ** add a a1 / add a a2 / hg cp a b 102 ** add a a1 / add a a2 / hg cp a b
101 - working to parent: 103 - working to parent:
102 A b 104 A b
103 a 105 a
209 -a2 211 -a2
210 +m1 212 +m1
211 +m2 213 +m2
212 214
213 215
216 created new head
214 ** single rename ** 217 ** single rename **
215 ** hg mv a b / add b b1 / add b w 218 ** hg mv a b / add b b1 / add b w
216 - working to parent: 219 - working to parent:
217 M b 220 M b
218 221
322 -b1 325 -b1
323 +m1 326 +m1
324 +m2 327 +m2
325 328
326 329
330 created new head
327 ** single copy ** 331 ** single copy **
328 ** hg cp a b / add b b1 / add a w 332 ** hg cp a b / add b b1 / add a w
329 - working to parent: 333 - working to parent:
330 M a 334 M a
331 335
470 -a 474 -a
471 -3 475 -3
472 -b1 476 -b1
473 477
474 478
479 created new head
475 ** rename chain ** 480 ** rename chain **
476 ** hg mv a b / hg mv b c / hg mv c d 481 ** hg mv a b / hg mv b c / hg mv c d
477 - working to parent: 482 - working to parent:
478 A d 483 A d
479 c 484 c
572 -4 577 -4
573 +m1 578 +m1
574 +m2 579 +m2
575 580
576 581
582 created new head
577 ** copy chain ** 583 ** copy chain **
578 ** hg cp a b / hg cp b c / hg cp c d 584 ** hg cp a b / hg cp b c / hg cp c d
579 - working to parent: 585 - working to parent:
580 A d 586 A d
581 c 587 c
791 @@ -1,2 +0,0 @@ 797 @@ -1,2 +0,0 @@
792 -a 798 -a
793 -5 799 -5
794 800
795 801
802 created new head
796 ** circular rename ** 803 ** circular rename **
797 ** add a a1 / hg mv a b / hg mv b a 804 ** add a a1 / hg mv a b / hg mv b a
798 - working to parent: 805 - working to parent:
799 A a 806 A a
800 b 807 b