equal
deleted
inserted
replaced
|
1 updating working directory |
|
2 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1 created new head |
3 created new head |
2 ** rename in working dir ** |
4 ** rename in working dir ** |
3 ** add a a1 / add a a2 / hg mv a b |
5 ** add a a1 / add a a2 / hg mv a b |
4 - working to parent: |
6 - working to parent: |
5 A b |
7 A b |
116 +++ b/x/y |
118 +++ b/x/y |
117 @@ -0,0 +1,1 @@ |
119 @@ -0,0 +1,1 @@ |
118 +y1 |
120 +y1 |
119 |
121 |
120 |
122 |
|
123 updating working directory |
|
124 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
121 created new head |
125 created new head |
122 ** copy in working dir ** |
126 ** copy in working dir ** |
123 ** add a a1 / add a a2 / hg cp a b |
127 ** add a a1 / add a a2 / hg cp a b |
124 - working to parent: |
128 - working to parent: |
125 A b |
129 A b |
253 +++ b/x/y |
257 +++ b/x/y |
254 @@ -0,0 +1,1 @@ |
258 @@ -0,0 +1,1 @@ |
255 +y1 |
259 +y1 |
256 |
260 |
257 |
261 |
|
262 updating working directory |
|
263 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
258 created new head |
264 created new head |
259 ** single rename ** |
265 ** single rename ** |
260 ** hg mv a b / add b b1 / add b w |
266 ** hg mv a b / add b b1 / add b w |
261 - working to parent: |
267 - working to parent: |
262 M b |
268 M b |
388 +++ b/x/y |
394 +++ b/x/y |
389 @@ -0,0 +1,1 @@ |
395 @@ -0,0 +1,1 @@ |
390 +y1 |
396 +y1 |
391 |
397 |
392 |
398 |
|
399 updating working directory |
|
400 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
393 created new head |
401 created new head |
394 ** single copy ** |
402 ** single copy ** |
395 ** hg cp a b / add b b1 / add a w |
403 ** hg cp a b / add b b1 / add a w |
396 - working to parent: |
404 - working to parent: |
397 M a |
405 M a |
558 +++ b/x/y |
566 +++ b/x/y |
559 @@ -0,0 +1,1 @@ |
567 @@ -0,0 +1,1 @@ |
560 +y1 |
568 +y1 |
561 |
569 |
562 |
570 |
|
571 updating working directory |
|
572 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
563 created new head |
573 created new head |
564 ** rename chain ** |
574 ** rename chain ** |
565 ** 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 |
566 - working to parent: |
576 - working to parent: |
567 A d |
577 A d |
682 +++ b/x/y |
692 +++ b/x/y |
683 @@ -0,0 +1,1 @@ |
693 @@ -0,0 +1,1 @@ |
684 +y1 |
694 +y1 |
685 |
695 |
686 |
696 |
|
697 updating working directory |
|
698 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
687 created new head |
699 created new head |
688 ** copy chain ** |
700 ** copy chain ** |
689 ** 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 |
690 - working to parent: |
702 - working to parent: |
691 A d |
703 A d |
923 +++ b/x/y |
935 +++ b/x/y |
924 @@ -0,0 +1,1 @@ |
936 @@ -0,0 +1,1 @@ |
925 +y1 |
937 +y1 |
926 |
938 |
927 |
939 |
|
940 updating working directory |
|
941 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
928 created new head |
942 created new head |
929 ** circular rename ** |
943 ** circular rename ** |
930 ** add a a1 / hg mv a b / hg mv b a |
944 ** add a a1 / hg mv a b / hg mv b a |
931 - working to parent: |
945 - working to parent: |
932 A a |
946 A a |
1045 +++ b/x/y |
1059 +++ b/x/y |
1046 @@ -0,0 +1,1 @@ |
1060 @@ -0,0 +1,1 @@ |
1047 +y1 |
1061 +y1 |
1048 |
1062 |
1049 |
1063 |
|
1064 updating working directory |
|
1065 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1050 created new head |
1066 created new head |
1051 moving x/x to y/x |
1067 moving x/x to y/x |
1052 ** directory move ** |
1068 ** directory move ** |
1053 ** 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 |
1054 - working to parent: |
1070 - working to parent: |