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