equal
deleted
inserted
replaced
5 > |
5 > |
6 > [phases] |
6 > [phases] |
7 > publish=False |
7 > publish=False |
8 > |
8 > |
9 > [alias] |
9 > [alias] |
10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
10 > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" |
11 > EOF |
11 > EOF |
12 |
12 |
13 |
13 |
14 $ hg init a |
14 $ hg init a |
15 $ cd a |
15 $ cd a |
32 |
32 |
33 $ hg clone -q -u . a a1 |
33 $ hg clone -q -u . a a1 |
34 $ cd a1 |
34 $ cd a1 |
35 |
35 |
36 $ hg tglog |
36 $ hg tglog |
37 @ 7: 'H' |
37 @ 7: 02de42196ebe 'H' |
38 | |
38 | |
39 | o 6: 'G' |
39 | o 6: eea13746799a 'G' |
40 |/| |
40 |/| |
41 o | 5: 'F' |
41 o | 5: 24b6387c8c8c 'F' |
42 | | |
42 | | |
43 | o 4: 'E' |
43 | o 4: 9520eea781bc 'E' |
44 |/ |
44 |/ |
45 | o 3: 'D' |
45 | o 3: 32af7686d403 'D' |
46 | | |
46 | | |
47 | o 2: 'C' |
47 | o 2: 5fddd98957c8 'C' |
48 | | |
48 | | |
49 | o 1: 'B' |
49 | o 1: 42ccdea3bb16 'B' |
50 |/ |
50 |/ |
51 o 0: 'A' |
51 o 0: cd010b8cd998 'A' |
52 |
52 |
53 |
53 |
54 $ hg status --rev "3^1" --rev 3 |
54 $ hg status --rev "3^1" --rev 3 |
55 A D |
55 A D |
56 $ echo collide > D |
56 $ echo collide > D |
70 $ cat D.orig |
70 $ cat D.orig |
71 collide |
71 collide |
72 $ rm D.orig |
72 $ rm D.orig |
73 |
73 |
74 $ hg tglog |
74 $ hg tglog |
75 o 7: 'D' |
75 o 7: 1619f02ff7dd 'D' |
76 | |
76 | |
77 @ 6: 'H' |
77 @ 6: 02de42196ebe 'H' |
78 | |
78 | |
79 | o 5: 'G' |
79 | o 5: eea13746799a 'G' |
80 |/| |
80 |/| |
81 o | 4: 'F' |
81 o | 4: 24b6387c8c8c 'F' |
82 | | |
82 | | |
83 | o 3: 'E' |
83 | o 3: 9520eea781bc 'E' |
84 |/ |
84 |/ |
85 | o 2: 'C' |
85 | o 2: 5fddd98957c8 'C' |
86 | | |
86 | | |
87 | o 1: 'B' |
87 | o 1: 42ccdea3bb16 'B' |
88 |/ |
88 |/ |
89 o 0: 'A' |
89 o 0: cd010b8cd998 'A' |
90 |
90 |
91 $ cd .. |
91 $ cd .. |
92 |
92 |
93 |
93 |
94 D onto F - intermediate point: |
94 D onto F - intermediate point: |
105 $ cat D.orig |
105 $ cat D.orig |
106 collide |
106 collide |
107 $ rm D.orig |
107 $ rm D.orig |
108 |
108 |
109 $ hg tglog |
109 $ hg tglog |
110 o 7: 'D' |
110 o 7: 2107530e74ab 'D' |
111 | |
111 | |
112 | @ 6: 'H' |
112 | @ 6: 02de42196ebe 'H' |
113 |/ |
113 |/ |
114 | o 5: 'G' |
114 | o 5: eea13746799a 'G' |
115 |/| |
115 |/| |
116 o | 4: 'F' |
116 o | 4: 24b6387c8c8c 'F' |
117 | | |
117 | | |
118 | o 3: 'E' |
118 | o 3: 9520eea781bc 'E' |
119 |/ |
119 |/ |
120 | o 2: 'C' |
120 | o 2: 5fddd98957c8 'C' |
121 | | |
121 | | |
122 | o 1: 'B' |
122 | o 1: 42ccdea3bb16 'B' |
123 |/ |
123 |/ |
124 o 0: 'A' |
124 o 0: cd010b8cd998 'A' |
125 |
125 |
126 $ cd .. |
126 $ cd .. |
127 |
127 |
128 |
128 |
129 E onto H - skip of G: |
129 E onto H - skip of G: |
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) |
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) |
143 $ f E.orig |
143 $ f E.orig |
144 E.orig: file not found |
144 E.orig: file not found |
145 |
145 |
146 $ hg tglog |
146 $ hg tglog |
147 o 6: 'E' |
147 o 6: 9f8b8ec77260 'E' |
148 | |
148 | |
149 @ 5: 'H' |
149 @ 5: 02de42196ebe 'H' |
150 | |
150 | |
151 o 4: 'F' |
151 o 4: 24b6387c8c8c 'F' |
152 | |
152 | |
153 | o 3: 'D' |
153 | o 3: 32af7686d403 'D' |
154 | | |
154 | | |
155 | o 2: 'C' |
155 | o 2: 5fddd98957c8 'C' |
156 | | |
156 | | |
157 | o 1: 'B' |
157 | o 1: 42ccdea3bb16 'B' |
158 |/ |
158 |/ |
159 o 0: 'A' |
159 o 0: cd010b8cd998 'A' |
160 |
160 |
161 $ cd .. |
161 $ cd .. |
162 |
162 |
163 |
163 |
164 F onto E - rebase of a branching point (skip G): |
164 F onto E - rebase of a branching point (skip G): |
172 note: rebase of 6:eea13746799a created no changes to commit |
172 note: rebase of 6:eea13746799a created no changes to commit |
173 rebasing 7:02de42196ebe "H" (tip) |
173 rebasing 7:02de42196ebe "H" (tip) |
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) |
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) |
175 |
175 |
176 $ hg tglog |
176 $ hg tglog |
177 @ 6: 'H' |
177 @ 6: e9240aeaa6ad 'H' |
178 | |
178 | |
179 o 5: 'F' |
179 o 5: 5d0ccadb6e3e 'F' |
180 | |
180 | |
181 o 4: 'E' |
181 o 4: 9520eea781bc 'E' |
182 | |
182 | |
183 | o 3: 'D' |
183 | o 3: 32af7686d403 'D' |
184 | | |
184 | | |
185 | o 2: 'C' |
185 | o 2: 5fddd98957c8 'C' |
186 | | |
186 | | |
187 | o 1: 'B' |
187 | o 1: 42ccdea3bb16 'B' |
188 |/ |
188 |/ |
189 o 0: 'A' |
189 o 0: cd010b8cd998 'A' |
190 |
190 |
191 $ cd .. |
191 $ cd .. |
192 |
192 |
193 |
193 |
194 G onto H - merged revision having a parent in ancestors of target: |
194 G onto H - merged revision having a parent in ancestors of target: |
199 $ hg rebase -s 6 -d 7 |
199 $ hg rebase -s 6 -d 7 |
200 rebasing 6:eea13746799a "G" |
200 rebasing 6:eea13746799a "G" |
201 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob) |
201 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob) |
202 |
202 |
203 $ hg tglog |
203 $ hg tglog |
204 o 7: 'G' |
204 o 7: 397834907a90 'G' |
205 |\ |
205 |\ |
206 | @ 6: 'H' |
206 | @ 6: 02de42196ebe 'H' |
207 | | |
207 | | |
208 | o 5: 'F' |
208 | o 5: 24b6387c8c8c 'F' |
209 | | |
209 | | |
210 o | 4: 'E' |
210 o | 4: 9520eea781bc 'E' |
211 |/ |
211 |/ |
212 | o 3: 'D' |
212 | o 3: 32af7686d403 'D' |
213 | | |
213 | | |
214 | o 2: 'C' |
214 | o 2: 5fddd98957c8 'C' |
215 | | |
215 | | |
216 | o 1: 'B' |
216 | o 1: 42ccdea3bb16 'B' |
217 |/ |
217 |/ |
218 o 0: 'A' |
218 o 0: cd010b8cd998 'A' |
219 |
219 |
220 $ cd .. |
220 $ cd .. |
221 |
221 |
222 |
222 |
223 F onto B - G maintains E as parent: |
223 F onto B - G maintains E as parent: |
230 rebasing 6:eea13746799a "G" |
230 rebasing 6:eea13746799a "G" |
231 rebasing 7:02de42196ebe "H" (tip) |
231 rebasing 7:02de42196ebe "H" (tip) |
232 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) |
232 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) |
233 |
233 |
234 $ hg tglog |
234 $ hg tglog |
235 @ 7: 'H' |
235 @ 7: c87be72f9641 'H' |
236 | |
236 | |
237 | o 6: 'G' |
237 | o 6: 17badd73d4f1 'G' |
238 |/| |
238 |/| |
239 o | 5: 'F' |
239 o | 5: 74fb9ed646c4 'F' |
240 | | |
240 | | |
241 | o 4: 'E' |
241 | o 4: 9520eea781bc 'E' |
242 | | |
242 | | |
243 | | o 3: 'D' |
243 | | o 3: 32af7686d403 'D' |
244 | | | |
244 | | | |
245 +---o 2: 'C' |
245 +---o 2: 5fddd98957c8 'C' |
246 | | |
246 | | |
247 o | 1: 'B' |
247 o | 1: 42ccdea3bb16 'B' |
248 |/ |
248 |/ |
249 o 0: 'A' |
249 o 0: cd010b8cd998 'A' |
250 |
250 |
251 $ cd .. |
251 $ cd .. |
252 |
252 |
253 |
253 |
254 These will fail (using --source): |
254 These will fail (using --source): |
302 $ hg rebase -d 0 -s 2 |
302 $ hg rebase -d 0 -s 2 |
303 rebasing 2:5fddd98957c8 "C" |
303 rebasing 2:5fddd98957c8 "C" |
304 rebasing 3:32af7686d403 "D" |
304 rebasing 3:32af7686d403 "D" |
305 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
305 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
306 $ hg tglog |
306 $ hg tglog |
307 o 7: 'D' |
307 o 7: c9659aac0000 'D' |
308 | |
308 | |
309 o 6: 'C' |
309 o 6: e1c4361dd923 'C' |
310 | |
310 | |
311 | @ 5: 'H' |
311 | @ 5: 02de42196ebe 'H' |
312 | | |
312 | | |
313 | | o 4: 'G' |
313 | | o 4: eea13746799a 'G' |
314 | |/| |
314 | |/| |
315 | o | 3: 'F' |
315 | o | 3: 24b6387c8c8c 'F' |
316 |/ / |
316 |/ / |
317 | o 2: 'E' |
317 | o 2: 9520eea781bc 'E' |
318 |/ |
318 |/ |
319 | o 1: 'B' |
319 | o 1: 42ccdea3bb16 'B' |
320 |/ |
320 |/ |
321 o 0: 'A' |
321 o 0: cd010b8cd998 'A' |
322 |
322 |
323 |
323 |
324 Check rebasing public changeset |
324 Check rebasing public changeset |
325 |
325 |
326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
422 adding file changes |
422 adding file changes |
423 added 9 changesets with 9 changes to 9 files (+2 heads) |
423 added 9 changesets with 9 changes to 9 files (+2 heads) |
424 new changesets 9ae2ed22e576:479ddb54a924 |
424 new changesets 9ae2ed22e576:479ddb54a924 |
425 (run 'hg heads' to see heads, 'hg merge' to merge) |
425 (run 'hg heads' to see heads, 'hg merge' to merge) |
426 $ hg tglog |
426 $ hg tglog |
427 o 8: 'I' |
427 o 8: 479ddb54a924 'I' |
428 | |
428 | |
429 o 7: 'H' |
429 o 7: 72434a4e60b0 'H' |
430 | |
430 | |
431 o 6: 'G' |
431 o 6: 3d8a618087a7 'G' |
432 | |
432 | |
433 | o 5: 'F' |
433 | o 5: 41bfcc75ed73 'F' |
434 | | |
434 | | |
435 | o 4: 'E' |
435 | o 4: c01897464e7f 'E' |
436 |/ |
436 |/ |
437 o 3: 'D' |
437 o 3: ffd453c31098 'D' |
438 | |
438 | |
439 o 2: 'C' |
439 o 2: c9e50f6cdc55 'C' |
440 | |
440 | |
441 | o 1: 'B' |
441 | o 1: 8fd0f7e49f53 'B' |
442 |/ |
442 |/ |
443 o 0: 'A' |
443 o 0: 9ae2ed22e576 'A' |
444 |
444 |
445 $ cd .. |
445 $ cd .. |
446 |
446 |
447 |
447 |
448 Simple case with keep: |
448 Simple case with keep: |
460 rebasing 3:ffd453c31098 "D" |
460 rebasing 3:ffd453c31098 "D" |
461 rebasing 6:3d8a618087a7 "G" |
461 rebasing 6:3d8a618087a7 "G" |
462 rebasing 7:72434a4e60b0 "H" |
462 rebasing 7:72434a4e60b0 "H" |
463 rebasing 8:479ddb54a924 "I" (tip) |
463 rebasing 8:479ddb54a924 "I" (tip) |
464 $ hg tglog |
464 $ hg tglog |
465 o 13: 'I' |
465 o 13: 9bf1d9358a90 'I' |
466 | |
466 | |
467 o 12: 'H' |
467 o 12: 274623a778d4 'H' |
468 | |
468 | |
469 o 11: 'G' |
469 o 11: ab8c8617c8e8 'G' |
470 | |
470 | |
471 o 10: 'D' |
471 o 10: c8cbf59f70da 'D' |
472 | |
472 | |
473 o 9: 'C' |
473 o 9: 563e4faab485 'C' |
474 | |
474 | |
475 | o 8: 'I' |
475 | o 8: 479ddb54a924 'I' |
476 | | |
476 | | |
477 | o 7: 'H' |
477 | o 7: 72434a4e60b0 'H' |
478 | | |
478 | | |
479 | o 6: 'G' |
479 | o 6: 3d8a618087a7 'G' |
480 | | |
480 | | |
481 | | o 5: 'F' |
481 | | o 5: 41bfcc75ed73 'F' |
482 | | | |
482 | | | |
483 | | o 4: 'E' |
483 | | o 4: c01897464e7f 'E' |
484 | |/ |
484 | |/ |
485 | o 3: 'D' |
485 | o 3: ffd453c31098 'D' |
486 | | |
486 | | |
487 | o 2: 'C' |
487 | o 2: c9e50f6cdc55 'C' |
488 | | |
488 | | |
489 o | 1: 'B' |
489 o | 1: 8fd0f7e49f53 'B' |
490 |/ |
490 |/ |
491 o 0: 'A' |
491 o 0: 9ae2ed22e576 'A' |
492 |
492 |
493 |
493 |
494 $ cd .. |
494 $ cd .. |
495 |
495 |
496 Base on have one descendant heads we ask for but common ancestor have two |
496 Base on have one descendant heads we ask for but common ancestor have two |
505 rebasing 3:ffd453c31098 "D" |
505 rebasing 3:ffd453c31098 "D" |
506 rebasing 6:3d8a618087a7 "G" |
506 rebasing 6:3d8a618087a7 "G" |
507 rebasing 7:72434a4e60b0 "H" |
507 rebasing 7:72434a4e60b0 "H" |
508 rebasing 8:479ddb54a924 "I" (tip) |
508 rebasing 8:479ddb54a924 "I" (tip) |
509 $ hg tglog |
509 $ hg tglog |
510 o 12: 'I' |
510 o 12: 9d7da0053b1c 'I' |
511 | |
511 | |
512 o 11: 'H' |
512 o 11: 8fbd00952cbc 'H' |
513 | |
513 | |
514 o 10: 'G' |
514 o 10: 51d434a615ee 'G' |
515 | |
515 | |
516 o 9: 'D' |
516 o 9: a9c125634b0b 'D' |
517 | |
517 | |
518 | o 8: 'I' |
518 | o 8: 479ddb54a924 'I' |
519 | | |
519 | | |
520 | o 7: 'H' |
520 | o 7: 72434a4e60b0 'H' |
521 | | |
521 | | |
522 | o 6: 'G' |
522 | o 6: 3d8a618087a7 'G' |
523 | | |
523 | | |
524 | | o 5: 'F' |
524 | | o 5: 41bfcc75ed73 'F' |
525 | | | |
525 | | | |
526 | | o 4: 'E' |
526 | | o 4: c01897464e7f 'E' |
527 | |/ |
527 | |/ |
528 | o 3: 'D' |
528 | o 3: ffd453c31098 'D' |
529 | | |
529 | | |
530 | o 2: 'C' |
530 | o 2: c9e50f6cdc55 'C' |
531 | | |
531 | | |
532 o | 1: 'B' |
532 o | 1: 8fd0f7e49f53 'B' |
533 |/ |
533 |/ |
534 o 0: 'A' |
534 o 0: 9ae2ed22e576 'A' |
535 |
535 |
536 |
536 |
537 $ cd .. |
537 $ cd .. |
538 |
538 |
539 rebase subset |
539 rebase subset |
547 $ hg rebase -r '3::7' -d 1 --keep |
547 $ hg rebase -r '3::7' -d 1 --keep |
548 rebasing 3:ffd453c31098 "D" |
548 rebasing 3:ffd453c31098 "D" |
549 rebasing 6:3d8a618087a7 "G" |
549 rebasing 6:3d8a618087a7 "G" |
550 rebasing 7:72434a4e60b0 "H" |
550 rebasing 7:72434a4e60b0 "H" |
551 $ hg tglog |
551 $ hg tglog |
552 o 11: 'H' |
552 o 11: 8fbd00952cbc 'H' |
553 | |
553 | |
554 o 10: 'G' |
554 o 10: 51d434a615ee 'G' |
555 | |
555 | |
556 o 9: 'D' |
556 o 9: a9c125634b0b 'D' |
557 | |
557 | |
558 | o 8: 'I' |
558 | o 8: 479ddb54a924 'I' |
559 | | |
559 | | |
560 | o 7: 'H' |
560 | o 7: 72434a4e60b0 'H' |
561 | | |
561 | | |
562 | o 6: 'G' |
562 | o 6: 3d8a618087a7 'G' |
563 | | |
563 | | |
564 | | o 5: 'F' |
564 | | o 5: 41bfcc75ed73 'F' |
565 | | | |
565 | | | |
566 | | o 4: 'E' |
566 | | o 4: c01897464e7f 'E' |
567 | |/ |
567 | |/ |
568 | o 3: 'D' |
568 | o 3: ffd453c31098 'D' |
569 | | |
569 | | |
570 | o 2: 'C' |
570 | o 2: c9e50f6cdc55 'C' |
571 | | |
571 | | |
572 o | 1: 'B' |
572 o | 1: 8fd0f7e49f53 'B' |
573 |/ |
573 |/ |
574 o 0: 'A' |
574 o 0: 9ae2ed22e576 'A' |
575 |
575 |
576 |
576 |
577 $ cd .. |
577 $ cd .. |
578 |
578 |
579 rebase subset with multiple head |
579 rebase subset with multiple head |
589 rebasing 4:c01897464e7f "E" |
589 rebasing 4:c01897464e7f "E" |
590 rebasing 5:41bfcc75ed73 "F" |
590 rebasing 5:41bfcc75ed73 "F" |
591 rebasing 6:3d8a618087a7 "G" |
591 rebasing 6:3d8a618087a7 "G" |
592 rebasing 7:72434a4e60b0 "H" |
592 rebasing 7:72434a4e60b0 "H" |
593 $ hg tglog |
593 $ hg tglog |
594 o 13: 'H' |
594 o 13: 8fbd00952cbc 'H' |
595 | |
595 | |
596 o 12: 'G' |
596 o 12: 51d434a615ee 'G' |
597 | |
597 | |
598 | o 11: 'F' |
598 | o 11: df23d8bda0b7 'F' |
599 | | |
599 | | |
600 | o 10: 'E' |
600 | o 10: 47b7889448ff 'E' |
601 |/ |
601 |/ |
602 o 9: 'D' |
602 o 9: a9c125634b0b 'D' |
603 | |
603 | |
604 | o 8: 'I' |
604 | o 8: 479ddb54a924 'I' |
605 | | |
605 | | |
606 | o 7: 'H' |
606 | o 7: 72434a4e60b0 'H' |
607 | | |
607 | | |
608 | o 6: 'G' |
608 | o 6: 3d8a618087a7 'G' |
609 | | |
609 | | |
610 | | o 5: 'F' |
610 | | o 5: 41bfcc75ed73 'F' |
611 | | | |
611 | | | |
612 | | o 4: 'E' |
612 | | o 4: c01897464e7f 'E' |
613 | |/ |
613 | |/ |
614 | o 3: 'D' |
614 | o 3: ffd453c31098 'D' |
615 | | |
615 | | |
616 | o 2: 'C' |
616 | o 2: c9e50f6cdc55 'C' |
617 | | |
617 | | |
618 o | 1: 'B' |
618 o | 1: 8fd0f7e49f53 'B' |
619 |/ |
619 |/ |
620 o 0: 'A' |
620 o 0: 9ae2ed22e576 'A' |
621 |
621 |
622 |
622 |
623 $ cd .. |
623 $ cd .. |
624 |
624 |
625 More advanced tests |
625 More advanced tests |
632 rebasing 6:3d8a618087a7 "G" |
632 rebasing 6:3d8a618087a7 "G" |
633 rebasing 7:72434a4e60b0 "H" |
633 rebasing 7:72434a4e60b0 "H" |
634 rebasing 8:479ddb54a924 "I" (tip) |
634 rebasing 8:479ddb54a924 "I" (tip) |
635 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob) |
635 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob) |
636 $ hg tglog |
636 $ hg tglog |
637 o 8: 'I' |
637 o 8: fcb52e68a694 'I' |
638 | |
638 | |
639 o 7: 'H' |
639 o 7: 77bd65cd7600 'H' |
640 | |
640 | |
641 o 6: 'G' |
641 o 6: 12d0e738fb18 'G' |
642 | |
642 | |
643 | o 5: 'F' |
643 | o 5: 41bfcc75ed73 'F' |
644 | | |
644 | | |
645 | o 4: 'E' |
645 | o 4: c01897464e7f 'E' |
646 | | |
646 | | |
647 | o 3: 'D' |
647 | o 3: ffd453c31098 'D' |
648 |/ |
648 |/ |
649 o 2: 'C' |
649 o 2: c9e50f6cdc55 'C' |
650 | |
650 | |
651 | o 1: 'B' |
651 | o 1: 8fd0f7e49f53 'B' |
652 |/ |
652 |/ |
653 o 0: 'A' |
653 o 0: 9ae2ed22e576 'A' |
654 |
654 |
655 $ cd .. |
655 $ cd .. |
656 |
656 |
657 |
657 |
658 rebase with multiple root. |
658 rebase with multiple root. |
667 rebasing 6:3d8a618087a7 "G" |
667 rebasing 6:3d8a618087a7 "G" |
668 rebasing 7:72434a4e60b0 "H" |
668 rebasing 7:72434a4e60b0 "H" |
669 rebasing 8:479ddb54a924 "I" (tip) |
669 rebasing 8:479ddb54a924 "I" (tip) |
670 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob) |
670 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob) |
671 $ hg tglog |
671 $ hg tglog |
672 o 8: 'I' |
672 o 8: 9136df9a87cf 'I' |
673 | |
673 | |
674 o 7: 'H' |
674 o 7: 23e8f30da832 'H' |
675 | |
675 | |
676 o 6: 'G' |
676 o 6: b0efe8534e8b 'G' |
677 | |
677 | |
678 | o 5: 'F' |
678 | o 5: 6eb5b496ab79 'F' |
679 | | |
679 | | |
680 | o 4: 'E' |
680 | o 4: d15eade9b0b1 'E' |
681 |/ |
681 |/ |
682 | o 3: 'D' |
682 | o 3: ffd453c31098 'D' |
683 | | |
683 | | |
684 | o 2: 'C' |
684 | o 2: c9e50f6cdc55 'C' |
685 | | |
685 | | |
686 o | 1: 'B' |
686 o | 1: 8fd0f7e49f53 'B' |
687 |/ |
687 |/ |
688 o 0: 'A' |
688 o 0: 9ae2ed22e576 'A' |
689 |
689 |
690 $ cd .. |
690 $ cd .. |
691 |
691 |
692 More complex rebase with multiple roots |
692 More complex rebase with multiple roots |
693 each root have a different common ancestor with the destination and this is a detach |
693 each root have a different common ancestor with the destination and this is a detach |
707 created new head |
707 created new head |
708 $ echo I > K |
708 $ echo I > K |
709 $ hg add K |
709 $ hg add K |
710 $ hg commit -m K |
710 $ hg commit -m K |
711 $ hg tglog |
711 $ hg tglog |
712 @ 10: 'K' |
712 @ 10: 23a4ace37988 'K' |
713 | |
713 | |
714 o 9: 'J' |
714 o 9: 1301922eeb0c 'J' |
715 | |
715 | |
716 | o 8: 'I' |
716 | o 8: e7ec4e813ba6 'I' |
717 | | |
717 | | |
718 | o 7: 'H' |
718 | o 7: 02de42196ebe 'H' |
719 | | |
719 | | |
720 +---o 6: 'G' |
720 +---o 6: eea13746799a 'G' |
721 | |/ |
721 | |/ |
722 | o 5: 'F' |
722 | o 5: 24b6387c8c8c 'F' |
723 | | |
723 | | |
724 o | 4: 'E' |
724 o | 4: 9520eea781bc 'E' |
725 |/ |
725 |/ |
726 | o 3: 'D' |
726 | o 3: 32af7686d403 'D' |
727 | | |
727 | | |
728 | o 2: 'C' |
728 | o 2: 5fddd98957c8 'C' |
729 | | |
729 | | |
730 | o 1: 'B' |
730 | o 1: 42ccdea3bb16 'B' |
731 |/ |
731 |/ |
732 o 0: 'A' |
732 o 0: cd010b8cd998 'A' |
733 |
733 |
734 (actual test) |
734 (actual test) |
735 |
735 |
736 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
736 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
737 rebasing 8:e7ec4e813ba6 "I" |
737 rebasing 8:e7ec4e813ba6 "I" |
750 user: test |
750 user: test |
751 date: Thu Jan 01 00:00:00 1970 +0000 |
751 date: Thu Jan 01 00:00:00 1970 +0000 |
752 summary: K |
752 summary: K |
753 |
753 |
754 $ hg tglog |
754 $ hg tglog |
755 @ 10: 'K' |
755 @ 10: 882431a34a0e 'K' |
756 | |
756 | |
757 | o 9: 'I' |
757 | o 9: adb617877056 'I' |
758 |/ |
758 |/ |
759 | o 8: 'J' |
759 | o 8: 1301922eeb0c 'J' |
760 | | |
760 | | |
761 | | o 7: 'H' |
761 | | o 7: 02de42196ebe 'H' |
762 | | | |
762 | | | |
763 o---+ 6: 'G' |
763 o---+ 6: eea13746799a 'G' |
764 |/ / |
764 |/ / |
765 | o 5: 'F' |
765 | o 5: 24b6387c8c8c 'F' |
766 | | |
766 | | |
767 o | 4: 'E' |
767 o | 4: 9520eea781bc 'E' |
768 |/ |
768 |/ |
769 | o 3: 'D' |
769 | o 3: 32af7686d403 'D' |
770 | | |
770 | | |
771 | o 2: 'C' |
771 | o 2: 5fddd98957c8 'C' |
772 | | |
772 | | |
773 | o 1: 'B' |
773 | o 1: 42ccdea3bb16 'B' |
774 |/ |
774 |/ |
775 o 0: 'A' |
775 o 0: cd010b8cd998 'A' |
776 |
776 |
777 |
777 |
778 Test that rebase is not confused by $CWD disappearing during rebase (issue4121) |
778 Test that rebase is not confused by $CWD disappearing during rebase (issue4121) |
779 |
779 |
780 $ cd .. |
780 $ cd .. |
831 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
831 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
832 $ touch g && hg add g && hg ci -m G |
832 $ touch g && hg add g && hg ci -m G |
833 created new head |
833 created new head |
834 |
834 |
835 $ hg tglog |
835 $ hg tglog |
836 @ 6: 'G' |
836 @ 6: 124bb27b6f28 'G' |
837 | |
837 | |
838 | o 5: 'F' |
838 | o 5: 412b391de760 'F' |
839 | | |
839 | | |
840 | | o 4: 'E' |
840 | | o 4: 82ae8dc7a9b7 'E' |
841 | | | |
841 | | | |
842 | o | 3: 'D' |
842 | o | 3: ab709c9f7171 'D' |
843 | | | |
843 | | | |
844 | | o 2: 'C' |
844 | | o 2: d84f5cfaaf14 'C' |
845 | |/ |
845 | |/ |
846 | o 1: 'B' |
846 | o 1: 76035bbd54bd 'B' |
847 |/ |
847 |/ |
848 o 0: 'A' |
848 o 0: 216878401574 'A' |
849 |
849 |
850 |
850 |
851 $ hg rebase -s 1 -d 6 |
851 $ hg rebase -s 1 -d 6 |
852 rebasing 1:76035bbd54bd "B" |
852 rebasing 1:76035bbd54bd "B" |
853 rebasing 2:d84f5cfaaf14 "C" |
853 rebasing 2:d84f5cfaaf14 "C" |
855 rebasing 3:ab709c9f7171 "D" |
855 rebasing 3:ab709c9f7171 "D" |
856 rebasing 5:412b391de760 "F" |
856 rebasing 5:412b391de760 "F" |
857 saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob) |
857 saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob) |
858 |
858 |
859 $ hg tglog |
859 $ hg tglog |
860 o 6: 'F' |
860 o 6: 31884cfb735e 'F' |
861 | |
861 | |
862 o 5: 'D' |
862 o 5: 6d89fa5b0909 'D' |
863 | |
863 | |
864 | o 4: 'E' |
864 | o 4: de64d97c697b 'E' |
865 | | |
865 | | |
866 | o 3: 'C' |
866 | o 3: b18e4d2d0aa1 'C' |
867 |/ |
867 |/ |
868 o 2: 'B' |
868 o 2: 0983daf9ff6a 'B' |
869 | |
869 | |
870 @ 1: 'G' |
870 @ 1: 124bb27b6f28 'G' |
871 | |
871 | |
872 o 0: 'A' |
872 o 0: 216878401574 'A' |
873 |
873 |
874 |
874 |
875 Test experimental revset |
875 Test experimental revset |
876 ======================== |
876 ======================== |
877 |
877 |