Mercurial > hg

comparison tests/test-mv-cp-st-diff.out @ 9611:a3d73b3e1f8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg.clone: report branch name on update
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 16 Oct 2009 23:57:34 +0200
parents 3f4f14eab085
children 83cfa1baf8ad
comparison
equal deleted inserted replaced
9610:d78fe60f6bda 9611:a3d73b3e1f8a
1 updating working directory 1 updating to branch default
2 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 created new head 3 created new head
4 ** rename in working dir ** 4 ** rename in working dir **
5 ** add a a1 / add a a2 / hg mv a b 5 ** add a a1 / add a a2 / hg mv a b
6 - working to parent: 6 - working to parent:
118 +++ b/x/y 118 +++ b/x/y
119 @@ -0,0 +1,1 @@ 119 @@ -0,0 +1,1 @@
120 +y1 120 +y1
121 121
122 122
123 updating working directory 123 updating to branch default
124 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 124 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
125 created new head 125 created new head
126 ** copy in working dir ** 126 ** copy in working dir **
127 ** add a a1 / add a a2 / hg cp a b 127 ** add a a1 / add a a2 / hg cp a b
128 - working to parent: 128 - working to parent:
257 +++ b/x/y 257 +++ b/x/y
258 @@ -0,0 +1,1 @@ 258 @@ -0,0 +1,1 @@
259 +y1 259 +y1
260 260
261 261
262 updating working directory 262 updating to branch default
263 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 263 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
264 created new head 264 created new head
265 ** single rename ** 265 ** single rename **
266 ** hg mv a b / add b b1 / add b w 266 ** hg mv a b / add b b1 / add b w
267 - working to parent: 267 - working to parent:
394 +++ b/x/y 394 +++ b/x/y
395 @@ -0,0 +1,1 @@ 395 @@ -0,0 +1,1 @@
396 +y1 396 +y1
397 397
398 398
399 updating working directory 399 updating to branch default
400 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 400 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
401 created new head 401 created new head
402 ** single copy ** 402 ** single copy **
403 ** hg cp a b / add b b1 / add a w 403 ** hg cp a b / add b b1 / add a w
404 - working to parent: 404 - working to parent:
566 +++ b/x/y 566 +++ b/x/y
567 @@ -0,0 +1,1 @@ 567 @@ -0,0 +1,1 @@
568 +y1 568 +y1
569 569
570 570
571 updating working directory 571 updating to branch default
572 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 572 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
573 created new head 573 created new head
574 ** rename chain ** 574 ** rename chain **
575 ** hg mv a b / hg mv b c / hg mv c d 575 ** hg mv a b / hg mv b c / hg mv c d
576 - working to parent: 576 - working to parent:
692 +++ b/x/y 692 +++ b/x/y
693 @@ -0,0 +1,1 @@ 693 @@ -0,0 +1,1 @@
694 +y1 694 +y1
695 695
696 696
697 updating working directory 697 updating to branch default
698 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 698 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
699 created new head 699 created new head
700 ** copy chain ** 700 ** copy chain **
701 ** hg cp a b / hg cp b c / hg cp c d 701 ** hg cp a b / hg cp b c / hg cp c d
702 - working to parent: 702 - working to parent:
935 +++ b/x/y 935 +++ b/x/y
936 @@ -0,0 +1,1 @@ 936 @@ -0,0 +1,1 @@
937 +y1 937 +y1
938 938
939 939
940 updating working directory 940 updating to branch default
941 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 941 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
942 created new head 942 created new head
943 ** circular rename ** 943 ** circular rename **
944 ** add a a1 / hg mv a b / hg mv b a 944 ** add a a1 / hg mv a b / hg mv b a
945 - working to parent: 945 - working to parent:
1059 +++ b/x/y 1059 +++ b/x/y
1060 @@ -0,0 +1,1 @@ 1060 @@ -0,0 +1,1 @@
1061 +y1 1061 +y1
1062 1062
1063 1063
1064 updating working directory 1064 updating to branch default
1065 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 1065 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1066 created new head 1066 created new head
1067 moving x/x to y/x 1067 moving x/x to y/x
1068 ** directory move ** 1068 ** directory move **
1069 ** hg mv x y / add y/x x1 / add y/x x2 1069 ** hg mv x y / add y/x x1 / add y/x x2