Show More
@@ -148,6 +148,7 b' Test that rewriting leaving instability ' | |||||
148 | stabilise |
|
148 | stabilise | |
149 |
|
149 | |||
150 | $ hg rebase -r 'unstable()' -d . |
|
150 | $ hg rebase -r 'unstable()' -d . | |
|
151 | $ hg up tip -q | |||
151 |
|
152 | |||
152 | Test dropping of changeset on the top of the stack |
|
153 | Test dropping of changeset on the top of the stack | |
153 | ------------------------------------------------------- |
|
154 | ------------------------------------------------------- |
@@ -71,7 +71,7 b' Rebasing B onto H and collapsing changes' | |||||
71 | |/ |
|
71 | |/ | |
72 | o 0:draft 'A' |
|
72 | o 0:draft 'A' | |
73 |
|
73 | |||
74 | $ hg manifest |
|
74 | $ hg manifest --rev tip | |
75 | A |
|
75 | A | |
76 | B |
|
76 | B | |
77 | C |
|
77 | C | |
@@ -107,7 +107,7 b' Rebasing E onto H:' | |||||
107 | |/ |
|
107 | |/ | |
108 | o 0: 'A' |
|
108 | o 0: 'A' | |
109 |
|
109 | |||
110 | $ hg manifest |
|
110 | $ hg manifest --rev tip | |
111 | A |
|
111 | A | |
112 | E |
|
112 | E | |
113 | F |
|
113 | F | |
@@ -142,7 +142,7 b' Rebasing G onto H with custom message:' | |||||
142 | |/ |
|
142 | |/ | |
143 | o 0: 'A' |
|
143 | o 0: 'A' | |
144 |
|
144 | |||
145 | $ hg manifest |
|
145 | $ hg manifest --rev tip | |
146 | A |
|
146 | A | |
147 | E |
|
147 | E | |
148 | F |
|
148 | F | |
@@ -249,7 +249,7 b' Rebase and collapse - E onto H:' | |||||
249 | |/ |
|
249 | |/ | |
250 | o 0: 'A' |
|
250 | o 0: 'A' | |
251 |
|
251 | |||
252 | $ hg manifest |
|
252 | $ hg manifest --rev tip | |
253 | A |
|
253 | A | |
254 | C |
|
254 | C | |
255 | D |
|
255 | D | |
@@ -399,7 +399,7 b' Rebase and collapse - E onto I:' | |||||
399 | |/ |
|
399 | |/ | |
400 | o 0: 'A' |
|
400 | o 0: 'A' | |
401 |
|
401 | |||
402 | $ hg manifest |
|
402 | $ hg manifest --rev tip | |
403 | A |
|
403 | A | |
404 | C |
|
404 | C | |
405 | D |
|
405 | D | |
@@ -407,6 +407,7 b' Rebase and collapse - E onto I:' | |||||
407 | G |
|
407 | G | |
408 | I |
|
408 | I | |
409 |
|
409 | |||
|
410 | $ hg up tip -q | |||
410 | $ cat E |
|
411 | $ cat E | |
411 | F |
|
412 | F | |
412 |
|
413 | |||
@@ -481,7 +482,7 b' Rebase and collapse - B onto F:' | |||||
481 | | |
|
482 | | | |
482 | o 0: 'A' |
|
483 | o 0: 'A' | |
483 |
|
484 | |||
484 | $ hg manifest |
|
485 | $ hg manifest --rev tip | |
485 | A |
|
486 | A | |
486 | B |
|
487 | B | |
487 | C |
|
488 | C | |
@@ -611,12 +612,13 b' Rebase, collapse and copies' | |||||
611 | merging f and c to c |
|
612 | merging f and c to c | |
612 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) |
|
613 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) | |
613 | $ hg st |
|
614 | $ hg st | |
614 |
$ hg st --copies --change |
|
615 | $ hg st --copies --change tip | |
615 | A d |
|
616 | A d | |
616 | a |
|
617 | a | |
617 | A g |
|
618 | A g | |
618 | b |
|
619 | b | |
619 | R b |
|
620 | R b | |
|
621 | $ hg up tip -q | |||
620 | $ cat c |
|
622 | $ cat c | |
621 | c |
|
623 | c | |
622 | c |
|
624 | c | |
@@ -648,7 +650,7 b' Test collapsing in place' | |||||
648 |
|
650 | |||
649 | $ hg rebase --collapse -b . -d 0 |
|
651 | $ hg rebase --collapse -b . -d 0 | |
650 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) |
|
652 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) | |
651 |
$ hg st --change |
|
653 | $ hg st --change tip --copies | |
652 | M a |
|
654 | M a | |
653 | M c |
|
655 | M c | |
654 | A d |
|
656 | A d | |
@@ -656,6 +658,7 b' Test collapsing in place' | |||||
656 | A g |
|
658 | A g | |
657 | b |
|
659 | b | |
658 | R b |
|
660 | R b | |
|
661 | $ hg up tip -q | |||
659 | $ cat a |
|
662 | $ cat a | |
660 | a |
|
663 | a | |
661 | a |
|
664 | a | |
@@ -741,7 +744,7 b' Test collapsing changes that add then re' | |||||
741 | | |
|
744 | | | |
742 | o 0: 'base' |
|
745 | o 0: 'base' | |
743 |
|
746 | |||
744 | $ hg manifest |
|
747 | $ hg manifest --rev tip | |
745 | b |
|
748 | b | |
746 | base |
|
749 | base | |
747 |
|
750 |
@@ -68,7 +68,7 b' Rebasing D onto H detaching from C:' | |||||
68 | |/ |
|
68 | |/ | |
69 | o 0:draft 'A' |
|
69 | o 0:draft 'A' | |
70 |
|
70 | |||
71 | $ hg manifest |
|
71 | $ hg manifest --rev tip | |
72 | A |
|
72 | A | |
73 | D |
|
73 | D | |
74 | F |
|
74 | F | |
@@ -119,7 +119,7 b' Rebasing C onto H detaching from B:' | |||||
119 | |/ |
|
119 | |/ | |
120 | o 0: 'A' |
|
120 | o 0: 'A' | |
121 |
|
121 | |||
122 | $ hg manifest |
|
122 | $ hg manifest --rev tip | |
123 | A |
|
123 | A | |
124 | C |
|
124 | C | |
125 | D |
|
125 | D | |
@@ -171,7 +171,7 b' Rebasing B onto H using detach (same as ' | |||||
171 | |/ |
|
171 | |/ | |
172 | o 0: 'A' |
|
172 | o 0: 'A' | |
173 |
|
173 | |||
174 | $ hg manifest |
|
174 | $ hg manifest --rev tip | |
175 | A |
|
175 | A | |
176 | B |
|
176 | B | |
177 | C |
|
177 | C | |
@@ -224,7 +224,7 b' Rebasing C onto H detaching from B and c' | |||||
224 | |/ |
|
224 | |/ | |
225 | o 0:draft 'A' |
|
225 | o 0:draft 'A' | |
226 |
|
226 | |||
227 | $ hg manifest |
|
227 | $ hg manifest --rev tip | |
228 | A |
|
228 | A | |
229 | C |
|
229 | C | |
230 | D |
|
230 | D | |
@@ -350,7 +350,7 b' Verify that target is not selected as ex' | |||||
350 | o 0: 'A' |
|
350 | o 0: 'A' | |
351 |
|
351 | |||
352 |
|
352 | |||
353 | $ hg parents |
|
353 | $ hg log --rev tip | |
354 | changeset: 8:9472f4b1d736 |
|
354 | changeset: 8:9472f4b1d736 | |
355 | tag: tip |
|
355 | tag: tip | |
356 | user: test |
|
356 | user: test |
@@ -283,7 +283,7 b' collapse rebase' | |||||
283 | |/ |
|
283 | |/ | |
284 | o 0:cd010b8cd998 A |
|
284 | o 0:cd010b8cd998 A | |
285 |
|
285 | |||
286 | $ hg id --debug |
|
286 | $ hg id --debug -r tip | |
287 | 4dc2197e807bae9817f09905b50ab288be2dbbcf tip |
|
287 | 4dc2197e807bae9817f09905b50ab288be2dbbcf tip | |
288 | $ hg debugobsolete |
|
288 | $ hg debugobsolete | |
289 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) |
|
289 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now