test-rebase-obsolete.t
687 lines
| 16.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-obsolete.t
|
r17612 | ========================== | ||
Test rebase with obsolete | ||||
========================== | ||||
Enable obsolete | ||||
$ cat >> $HGRCPATH << EOF | ||||
> [ui] | ||||
> logtemplate= {rev}:{node|short} {desc|firstline} | ||||
|
r22955 | > [experimental] | ||
> evolution=createmarkers,allowunstable | ||||
|
r17612 | > [phases] | ||
> publish=False | ||||
|
r27011 | > [extensions] | ||
|
r17612 | > rebase= | ||
> EOF | ||||
Setup rebase canonical repo | ||||
$ hg init base | ||||
$ cd base | ||||
$ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 8 changesets with 7 changes to 7 files (+2 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg up tip | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg log -G | ||||
@ 7:02de42196ebe H | ||||
| | ||||
| o 6:eea13746799a G | ||||
|/| | ||||
o | 5:24b6387c8c8c F | ||||
| | | ||||
| o 4:9520eea781bc E | ||||
|/ | ||||
| o 3:32af7686d403 D | ||||
| | | ||||
| o 2:5fddd98957c8 C | ||||
| | | ||||
| o 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ cd .. | ||||
simple rebase | ||||
--------------------------------- | ||||
$ hg clone base simple | ||||
updating to branch default | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd simple | ||||
$ hg up 32af7686d403 | ||||
3 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ hg rebase -d eea13746799a | ||||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r17612 | $ hg log -G | ||
@ 10:8eeb3c33ad33 D | ||||
| | ||||
o 9:2327fea05063 C | ||||
| | ||||
o 8:e4e5be0395b2 B | ||||
| | ||||
| o 7:02de42196ebe H | ||||
| | | ||||
o | 6:eea13746799a G | ||||
|\| | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg log --hidden -G | ||||
@ 10:8eeb3c33ad33 D | ||||
| | ||||
o 9:2327fea05063 C | ||||
| | ||||
o 8:e4e5be0395b2 B | ||||
| | ||||
| o 7:02de42196ebe H | ||||
| | | ||||
o | 6:eea13746799a G | ||||
|\| | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
| x 3:32af7686d403 D | ||||
| | | ||||
| x 2:5fddd98957c8 C | ||||
| | | ||||
| x 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg debugobsolete | ||||
|
r22220 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (*) {'user': 'test'} (glob) | ||
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 2327fea05063f39961b14cb69435a9898dc9a245 0 (*) {'user': 'test'} (glob) | ||||
32af7686d403cf45b5d95f2d70cebea587ac806a 8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (*) {'user': 'test'} (glob) | ||||
|
r17612 | |||
$ cd .. | ||||
empty changeset | ||||
--------------------------------- | ||||
$ hg clone base empty | ||||
updating to branch default | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd empty | ||||
$ hg up eea13746799a | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
We make a copy of both the first changeset in the rebased and some other in the | ||||
set. | ||||
$ hg graft 42ccdea3bb16 32af7686d403 | ||||
|
r23505 | grafting 1:42ccdea3bb16 "B" | ||
grafting 3:32af7686d403 "D" | ||||
|
r17612 | $ hg rebase -s 42ccdea3bb16 -d . | ||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
|
r23518 | note: rebase of 1:42ccdea3bb16 created no changes to commit | ||
|
r23517 | rebasing 2:5fddd98957c8 "C" | ||
rebasing 3:32af7686d403 "D" | ||||
|
r23518 | note: rebase of 3:32af7686d403 created no changes to commit | ||
|
r17612 | $ hg log -G | ||
|
r19925 | o 10:5ae4c968c6ac C | ||
|
r17612 | | | ||
|
r19925 | @ 9:08483444fef9 D | ||
|
r17612 | | | ||
o 8:8877864f1edb B | ||||
| | ||||
| o 7:02de42196ebe H | ||||
| | | ||||
o | 6:eea13746799a G | ||||
|\| | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg log --hidden -G | ||||
|
r19925 | o 10:5ae4c968c6ac C | ||
|
r17612 | | | ||
|
r19925 | @ 9:08483444fef9 D | ||
|
r17612 | | | ||
o 8:8877864f1edb B | ||||
| | ||||
| o 7:02de42196ebe H | ||||
| | | ||||
o | 6:eea13746799a G | ||||
|\| | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
| x 3:32af7686d403 D | ||||
| | | ||||
| x 2:5fddd98957c8 C | ||||
| | | ||||
| x 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg debugobsolete | ||||
|
r22260 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | ||
|
r22220 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | ||
|
r22260 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | ||
|
r18444 | |||
More complex case were part of the rebase set were already rebased | ||||
$ hg rebase --rev 'desc(D)' --dest 'desc(H)' | ||||
|
r23517 | rebasing 9:08483444fef9 "D" | ||
|
r18444 | $ hg debugobsolete | ||
|
r22260 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | ||
|
r22220 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | ||
|
r22260 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | ||
|
r22220 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | ||
|
r18444 | $ hg log -G | ||
|
r19861 | @ 11:4596109a6a43 D | ||
|
r18444 | | | ||
| o 10:5ae4c968c6ac C | ||||
| | | ||||
| x 9:08483444fef9 D | ||||
| | | ||||
| o 8:8877864f1edb B | ||||
| | | ||||
o | 7:02de42196ebe H | ||||
| | | ||||
| o 6:eea13746799a G | ||||
|/| | ||||
o | 5:24b6387c8c8c F | ||||
| | | ||||
| o 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r26349 | $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True | ||
|
r23517 | rebasing 8:8877864f1edb "B" | ||
|
r26349 | note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" | ||
|
r23517 | rebasing 10:5ae4c968c6ac "C" | ||
|
r18444 | $ hg debugobsolete | ||
|
r22260 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | ||
|
r22220 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | ||
|
r22260 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | ||
|
r22220 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | ||
8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) | ||||
5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) | ||||
|
r18444 | $ hg log --rev 'divergent()' | ||
$ hg log -G | ||||
|
r19925 | o 13:98f6af4ee953 C | ||
|
r18444 | | | ||
|
r19861 | o 12:462a34d07e59 B | ||
|
r18444 | | | ||
|
r19925 | @ 11:4596109a6a43 D | ||
|
r18444 | | | ||
o 7:02de42196ebe H | ||||
| | ||||
| o 6:eea13746799a G | ||||
|/| | ||||
o | 5:24b6387c8c8c F | ||||
| | | ||||
| o 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r19861 | $ hg log --style default --debug -r 4596109a6a4328c398bde3a4a3b6737cfade3003 | ||
changeset: 11:4596109a6a4328c398bde3a4a3b6737cfade3003 | ||||
phase: draft | ||||
parent: 7:02de42196ebee42ef284b6780a87cdc96e8eaab6 | ||||
parent: -1:0000000000000000000000000000000000000000 | ||||
manifest: 11:a91006e3a02f1edf631f7018e6e5684cf27dd905 | ||||
user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
date: Sat Apr 30 15:24:48 2011 +0200 | ||||
files+: D | ||||
extra: branch=default | ||||
extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c | ||||
extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | ||||
description: | ||||
D | ||||
|
r26902 | $ hg up -qr 'desc(G)' | ||
$ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 | ||||
grafting 11:4596109a6a43 "D" | ||||
$ hg up -qr 'desc(E)' | ||||
$ hg rebase -s tip -d . | ||||
|
r27147 | rebasing 14:0f4c66d0b70f "D" (tip) | ||
|
r26902 | $ hg log --style default --debug -r tip | ||
|
r27147 | changeset: 15:884f358981b4d32069bb539e0e95d49a35eb81d0 | ||
|
r26902 | tag: tip | ||
phase: draft | ||||
parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba | ||||
parent: -1:0000000000000000000000000000000000000000 | ||||
manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 | ||||
user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
date: Sat Apr 30 15:24:48 2011 +0200 | ||||
files+: D | ||||
extra: branch=default | ||||
extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 | ||||
|
r27147 | extra: rebase_source=0f4c66d0b70f8e1ce4aec01f8e95cf24ee923afa | ||
|
r26902 | extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | ||
description: | ||||
D | ||||
|
r17612 | $ cd .. | ||
|
r17613 | collapse rebase | ||
--------------------------------- | ||||
$ hg clone base collapse | ||||
updating to branch default | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd collapse | ||||
$ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse | ||||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r17613 | $ hg log -G | ||
|
r19925 | o 8:4dc2197e807b Collapsed revision | ||
|
r17613 | | | ||
|
r19925 | | @ 7:02de42196ebe H | ||
|
r17613 | | | | ||
o | 6:eea13746799a G | ||||
|\| | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg log --hidden -G | ||||
|
r19925 | o 8:4dc2197e807b Collapsed revision | ||
|
r17613 | | | ||
|
r19925 | | @ 7:02de42196ebe H | ||
|
r17613 | | | | ||
o | 6:eea13746799a G | ||||
|\| | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
| x 3:32af7686d403 D | ||||
| | | ||||
| x 2:5fddd98957c8 C | ||||
| | | ||||
| x 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r19924 | $ hg id --debug -r tip | ||
|
r17613 | 4dc2197e807bae9817f09905b50ab288be2dbbcf tip | ||
$ hg debugobsolete | ||||
|
r22220 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) | ||
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) | ||||
32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) | ||||
|
r17613 | |||
$ cd .. | ||||
|
r17615 | Rebase set has hidden descendants | ||
--------------------------------- | ||||
We rebase a changeset which has a hidden changeset. The hidden changeset must | ||||
not be rebased. | ||||
$ hg clone base hidden | ||||
updating to branch default | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd hidden | ||||
$ hg rebase -s 5fddd98957c8 -d eea13746799a | ||||
|
r23517 | rebasing 2:5fddd98957c8 "C" | ||
rebasing 3:32af7686d403 "D" | ||||
|
r17615 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe | ||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
|
r17615 | $ hg log -G | ||
|
r19925 | o 10:7c6027df6a99 B | ||
|
r17615 | | | ||
| o 9:cf44d2f5a9f4 D | ||||
| | | ||||
| o 8:e273c5e7d2d2 C | ||||
| | | ||||
|
r19925 | @ | 7:02de42196ebe H | ||
|
r17615 | | | | ||
| o 6:eea13746799a G | ||||
|/| | ||||
o | 5:24b6387c8c8c F | ||||
| | | ||||
| o 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg log --hidden -G | ||||
|
r19925 | o 10:7c6027df6a99 B | ||
|
r17615 | | | ||
| o 9:cf44d2f5a9f4 D | ||||
| | | ||||
| o 8:e273c5e7d2d2 C | ||||
| | | ||||
|
r19925 | @ | 7:02de42196ebe H | ||
|
r17615 | | | | ||
| o 6:eea13746799a G | ||||
|/| | ||||
o | 5:24b6387c8c8c F | ||||
| | | ||||
| o 4:9520eea781bc E | ||||
|/ | ||||
| x 3:32af7686d403 D | ||||
| | | ||||
| x 2:5fddd98957c8 C | ||||
| | | ||||
| x 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg debugobsolete | ||||
|
r22220 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob) | ||
32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob) | ||||
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob) | ||||
|
r17615 | |||
|
r18398 | Test that rewriting leaving instability behind is allowed | ||
--------------------------------------------------------------------- | ||||
|
r18164 | |||
$ hg log -r 'children(8)' | ||||
9:cf44d2f5a9f4 D (no-eol) | ||||
$ hg rebase -r 8 | ||||
|
r23517 | rebasing 8:e273c5e7d2d2 "C" | ||
|
r18164 | $ hg log -G | ||
|
r19925 | o 11:0d8f238b634c C | ||
|
r18164 | | | ||
o 10:7c6027df6a99 B | ||||
| | ||||
| o 9:cf44d2f5a9f4 D | ||||
| | | ||||
| x 8:e273c5e7d2d2 C | ||||
| | | ||||
|
r19925 | @ | 7:02de42196ebe H | ||
|
r18164 | | | | ||
| o 6:eea13746799a G | ||||
|/| | ||||
o | 5:24b6387c8c8c F | ||||
| | | ||||
| o 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r18424 | Test multiple root handling | ||
------------------------------------ | ||||
$ hg rebase --dest 4 --rev '7+11+9' | ||||
|
r23517 | rebasing 7:02de42196ebe "H" | ||
rebasing 9:cf44d2f5a9f4 "D" | ||||
not rebasing ignored 10:7c6027df6a99 "B" | ||||
rebasing 11:0d8f238b634c "C" (tip) | ||||
|
r18424 | $ hg log -G | ||
|
r19925 | o 14:1e8370e38cca C | ||
|
r18424 | | | ||
| o 13:102b4c1d889b D | ||||
|
r18447 | | | | ||
|
r19925 | @ | 12:bfe264faf697 H | ||
|
r18424 | |/ | ||
| o 10:7c6027df6a99 B | ||||
| | | ||||
| x 7:02de42196ebe H | ||||
| | | ||||
+---o 6:eea13746799a G | ||||
| |/ | ||||
| o 5:24b6387c8c8c F | ||||
| | | ||||
o | 4:9520eea781bc E | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r18444 | $ cd .. | ||
|
r18472 | |||
test on rebase dropping a merge | ||||
(setup) | ||||
$ hg init dropmerge | ||||
$ cd dropmerge | ||||
$ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 8 changesets with 7 changes to 7 files (+2 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg up 3 | ||||
4 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg merge 7 | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci -m 'M' | ||||
$ echo I > I | ||||
$ hg add I | ||||
$ hg ci -m I | ||||
$ hg log -G | ||||
@ 9:4bde274eefcf I | ||||
| | ||||
o 8:53a6a128b2b7 M | ||||
|\ | ||||
| o 7:02de42196ebe H | ||||
| | | ||||
| | o 6:eea13746799a G | ||||
| |/| | ||||
| o | 5:24b6387c8c8c F | ||||
| | | | ||||
| | o 4:9520eea781bc E | ||||
| |/ | ||||
o | 3:32af7686d403 D | ||||
| | | ||||
o | 2:5fddd98957c8 C | ||||
| | | ||||
o | 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
(actual test) | ||||
$ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' | ||||
|
r23517 | rebasing 3:32af7686d403 "D" | ||
rebasing 7:02de42196ebe "H" | ||||
not rebasing ignored 8:53a6a128b2b7 "M" | ||||
rebasing 9:4bde274eefcf "I" (tip) | ||||
|
r18472 | $ hg log -G | ||
@ 12:acd174b7ab39 I | ||||
| | ||||
o 11:6c11a6218c97 H | ||||
| | ||||
| o 10:b5313c85b22e D | ||||
|/ | ||||
| o 8:53a6a128b2b7 M | ||||
| |\ | ||||
| | x 7:02de42196ebe H | ||||
| | | | ||||
o---+ 6:eea13746799a G | ||||
| | | | ||||
| | o 5:24b6387c8c8c F | ||||
| | | | ||||
o---+ 4:9520eea781bc E | ||||
/ / | ||||
x | 3:32af7686d403 D | ||||
| | | ||||
o | 2:5fddd98957c8 C | ||||
| | | ||||
o | 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r23970 | |||
Test hidden changesets in the rebase set (issue4504) | ||||
$ hg up --hidden 9 | ||||
3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo J > J | ||||
$ hg add J | ||||
$ hg commit -m J | ||||
$ hg debugobsolete `hg log --rev . -T '{node}'` | ||||
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback | ||||
rebasing 9:4bde274eefcf "I" | ||||
rebasing 13:06edfc82198f "J" (tip) | ||||
$ hg log -G | ||||
@ 15:5ae8a643467b J | ||||
| | ||||
o 14:9ad579b4a5de I | ||||
| | ||||
| o 12:acd174b7ab39 I | ||||
| | | ||||
| o 11:6c11a6218c97 H | ||||
| | | ||||
o | 10:b5313c85b22e D | ||||
|/ | ||||
| o 8:53a6a128b2b7 M | ||||
| |\ | ||||
| | x 7:02de42196ebe H | ||||
| | | | ||||
o---+ 6:eea13746799a G | ||||
| | | | ||||
| | o 5:24b6387c8c8c F | ||||
| | | | ||||
o---+ 4:9520eea781bc E | ||||
/ / | ||||
x | 3:32af7686d403 D | ||||
| | | ||||
o | 2:5fddd98957c8 C | ||||
| | | ||||
o | 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
|
r26349 | $ hg up 14 -C | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo "K" > K | ||||
$ hg add K | ||||
$ hg commit --amend -m "K" | ||||
$ echo "L" > L | ||||
$ hg add L | ||||
$ hg commit -m "L" | ||||
$ hg up '.^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo "M" > M | ||||
$ hg add M | ||||
$ hg commit --amend -m "M" | ||||
$ hg log -G | ||||
@ 20:bfaedf8eb73b M | ||||
| | ||||
| o 18:97219452e4bd L | ||||
| | | ||||
| x 17:fc37a630c901 K | ||||
|/ | ||||
| o 15:5ae8a643467b J | ||||
| | | ||||
| x 14:9ad579b4a5de I | ||||
|/ | ||||
| o 12:acd174b7ab39 I | ||||
| | | ||||
| o 11:6c11a6218c97 H | ||||
| | | ||||
o | 10:b5313c85b22e D | ||||
|/ | ||||
| o 8:53a6a128b2b7 M | ||||
| |\ | ||||
| | x 7:02de42196ebe H | ||||
| | | | ||||
o---+ 6:eea13746799a G | ||||
| | | | ||||
| | o 5:24b6387c8c8c F | ||||
| | | | ||||
o---+ 4:9520eea781bc E | ||||
/ / | ||||
x | 3:32af7686d403 D | ||||
| | | ||||
o | 2:5fddd98957c8 C | ||||
| | | ||||
o | 1:42ccdea3bb16 B | ||||
|/ | ||||
o 0:cd010b8cd998 A | ||||
$ hg rebase -s 14 -d 18 --config experimental.rebaseskipobsolete=True | ||||
note: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K" | ||||
rebasing 15:5ae8a643467b "J" | ||||
|
r26675 | $ cd .. | ||
Skip obsolete changeset even with multiple hops | ||||
----------------------------------------------- | ||||
setup | ||||
$ hg init obsskip | ||||
$ cd obsskip | ||||
$ cat << EOF >> .hg/hgrc | ||||
> [experimental] | ||||
> rebaseskipobsolete = True | ||||
> [extensions] | ||||
> strip = | ||||
> EOF | ||||
$ echo A > A | ||||
$ hg add A | ||||
$ hg commit -m A | ||||
$ echo B > B | ||||
$ hg add B | ||||
$ hg commit -m B0 | ||||
$ hg commit --amend -m B1 | ||||
$ hg commit --amend -m B2 | ||||
$ hg up --hidden 'desc(B0)' | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo C > C | ||||
$ hg add C | ||||
$ hg commit -m C | ||||
Rebase finds its way in a chain of marker | ||||
$ hg rebase -d 'desc(B2)' | ||||
note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" | ||||
rebasing 4:212cb178bcbb "C" (tip) | ||||
Even when the chain include missing node | ||||
$ hg up --hidden 'desc(B0)' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo D > D | ||||
$ hg add D | ||||
$ hg commit -m D | ||||
$ hg --hidden strip -r 'desc(B1)' | ||||
saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob) | ||||
$ hg rebase -d 'desc(B2)' | ||||
note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" | ||||
rebasing 5:1a79b7535141 "D" (tip) | ||||
|
r27012 | $ hg up 4 | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo "O" > O | ||||
$ hg add O | ||||
$ hg commit -m O | ||||
$ echo "P" > P | ||||
$ hg add P | ||||
$ hg commit -m P | ||||
$ hg log -G | ||||
@ 8:8d47583e023f P | ||||
| | ||||
o 7:360bbaa7d3ce O | ||||
| | ||||
| o 6:9c48361117de D | ||||
| | | ||||
o | 4:ff2c4d47b71d C | ||||
|/ | ||||
o 2:261e70097290 B2 | ||||
| | ||||
o 0:4a2df7238c3b A | ||||
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all | ||||
$ hg rebase -d 6 -r "4::" | ||||
rebasing 4:ff2c4d47b71d "C" | ||||
note: not rebasing 7:360bbaa7d3ce "O", it has no successor | ||||
rebasing 8:8d47583e023f "P" (tip) | ||||