mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
0f9abc9deb
Changeset 9a4b77db854b introduced a guard against case where obsolete changesets are included in the rebase in a way this will result in divergence (because rebase create new successors for changeset which already have successors). In the same go a 'rebase.allowdivergence' option was introduced to control that behavior. We rename this config option to 'experimental.allowdivergence' for multiple reasons: * First this behavior is attached to changeset evolution, a feature still experimental. * Second, there was no 'rebase' section in config before we introduced this option. I would like to avoid proliferation of micro config section and therefore would like to avoid the creation of this new section just for an experimental feature. * Third, this guard (warning the user about a history rewriting operation that will create divergence) will very likely be generalised to all history rewriting operations, making this not rebase specific. * Finally, because this will likely be a general guard present a bit everywhere in the UI we'll likely end up with something better than a config option to control this behavior, so having the current config option living in experimental will allow us make it disappear in the future. So we banish this config option back to the experimental section where it belongs, killing the newly born 'rebase' config section in the process.
808 lines
19 KiB
Perl
808 lines
19 KiB
Perl
==========================
|
|
Test rebase with obsolete
|
|
==========================
|
|
|
|
Enable obsolete
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [ui]
|
|
> logtemplate= {rev}:{node|short} {desc|firstline}
|
|
> [experimental]
|
|
> evolution=createmarkers,allowunstable
|
|
> [phases]
|
|
> publish=False
|
|
> [extensions]
|
|
> 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
|
|
rebasing 1:42ccdea3bb16 "B"
|
|
rebasing 2:5fddd98957c8 "C"
|
|
rebasing 3:32af7686d403 "D"
|
|
$ 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
|
|
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (*) {'user': 'test'} (glob)
|
|
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 2327fea05063f39961b14cb69435a9898dc9a245 0 (*) {'user': 'test'} (glob)
|
|
32af7686d403cf45b5d95f2d70cebea587ac806a 8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (*) {'user': 'test'} (glob)
|
|
|
|
|
|
$ 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
|
|
grafting 1:42ccdea3bb16 "B"
|
|
grafting 3:32af7686d403 "D"
|
|
$ hg rebase -s 42ccdea3bb16 -d .
|
|
rebasing 1:42ccdea3bb16 "B"
|
|
note: rebase of 1:42ccdea3bb16 created no changes to commit
|
|
rebasing 2:5fddd98957c8 "C"
|
|
rebasing 3:32af7686d403 "D"
|
|
note: rebase of 3:32af7686d403 created no changes to commit
|
|
$ hg log -G
|
|
o 10:5ae4c968c6ac C
|
|
|
|
|
@ 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
|
|
|
|
$ hg log --hidden -G
|
|
o 10:5ae4c968c6ac C
|
|
|
|
|
@ 9:08483444fef9 D
|
|
|
|
|
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
|
|
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
|
|
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
|
|
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
|
|
|
|
|
|
More complex case were part of the rebase set were already rebased
|
|
|
|
$ hg rebase --rev 'desc(D)' --dest 'desc(H)'
|
|
rebasing 9:08483444fef9 "D"
|
|
$ hg debugobsolete
|
|
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
|
|
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
|
|
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
|
|
08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob)
|
|
$ hg log -G
|
|
@ 11:4596109a6a43 D
|
|
|
|
|
| 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
|
|
|
|
$ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
|
|
rebasing 8:8877864f1edb "B"
|
|
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D"
|
|
rebasing 10:5ae4c968c6ac "C"
|
|
$ hg debugobsolete
|
|
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
|
|
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
|
|
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
|
|
08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob)
|
|
8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob)
|
|
5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob)
|
|
$ hg log --rev 'divergent()'
|
|
$ hg log -G
|
|
o 13:98f6af4ee953 C
|
|
|
|
|
o 12:462a34d07e59 B
|
|
|
|
|
@ 11:4596109a6a43 D
|
|
|
|
|
o 7:02de42196ebe H
|
|
|
|
|
| o 6:eea13746799a G
|
|
|/|
|
|
o | 5:24b6387c8c8c F
|
|
| |
|
|
| o 4:9520eea781bc E
|
|
|/
|
|
o 0:cd010b8cd998 A
|
|
|
|
$ 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
|
|
|
|
|
|
$ hg up -qr 'desc(G)'
|
|
$ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003
|
|
grafting 11:4596109a6a43 "D"
|
|
$ hg up -qr 'desc(E)'
|
|
$ hg rebase -s tip -d .
|
|
rebasing 14:9e36056a46e3 "D" (tip)
|
|
$ hg log --style default --debug -r tip
|
|
changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab
|
|
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
|
|
extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f
|
|
extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a
|
|
description:
|
|
D
|
|
|
|
|
|
$ cd ..
|
|
|
|
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
|
|
rebasing 1:42ccdea3bb16 "B"
|
|
rebasing 2:5fddd98957c8 "C"
|
|
rebasing 3:32af7686d403 "D"
|
|
$ hg log -G
|
|
o 8:4dc2197e807b Collapsed revision
|
|
|
|
|
| @ 7:02de42196ebe H
|
|
| |
|
|
o | 6:eea13746799a G
|
|
|\|
|
|
| o 5:24b6387c8c8c F
|
|
| |
|
|
o | 4:9520eea781bc E
|
|
|/
|
|
o 0:cd010b8cd998 A
|
|
|
|
$ hg log --hidden -G
|
|
o 8:4dc2197e807b Collapsed revision
|
|
|
|
|
| @ 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 id --debug -r tip
|
|
4dc2197e807bae9817f09905b50ab288be2dbbcf tip
|
|
$ hg debugobsolete
|
|
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob)
|
|
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob)
|
|
32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob)
|
|
|
|
$ cd ..
|
|
|
|
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
|
|
rebasing 2:5fddd98957c8 "C"
|
|
rebasing 3:32af7686d403 "D"
|
|
$ hg rebase -s 42ccdea3bb16 -d 02de42196ebe
|
|
rebasing 1:42ccdea3bb16 "B"
|
|
$ hg log -G
|
|
o 10:7c6027df6a99 B
|
|
|
|
|
| o 9:cf44d2f5a9f4 D
|
|
| |
|
|
| o 8:e273c5e7d2d2 C
|
|
| |
|
|
@ | 7:02de42196ebe H
|
|
| |
|
|
| o 6:eea13746799a G
|
|
|/|
|
|
o | 5:24b6387c8c8c F
|
|
| |
|
|
| o 4:9520eea781bc E
|
|
|/
|
|
o 0:cd010b8cd998 A
|
|
|
|
$ hg log --hidden -G
|
|
o 10:7c6027df6a99 B
|
|
|
|
|
| o 9:cf44d2f5a9f4 D
|
|
| |
|
|
| o 8:e273c5e7d2d2 C
|
|
| |
|
|
@ | 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
|
|
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob)
|
|
32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob)
|
|
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob)
|
|
|
|
Test that rewriting leaving instability behind is allowed
|
|
---------------------------------------------------------------------
|
|
|
|
$ hg log -r 'children(8)'
|
|
9:cf44d2f5a9f4 D (no-eol)
|
|
$ hg rebase -r 8
|
|
rebasing 8:e273c5e7d2d2 "C"
|
|
$ hg log -G
|
|
o 11:0d8f238b634c C
|
|
|
|
|
o 10:7c6027df6a99 B
|
|
|
|
|
| o 9:cf44d2f5a9f4 D
|
|
| |
|
|
| x 8:e273c5e7d2d2 C
|
|
| |
|
|
@ | 7:02de42196ebe H
|
|
| |
|
|
| o 6:eea13746799a G
|
|
|/|
|
|
o | 5:24b6387c8c8c F
|
|
| |
|
|
| o 4:9520eea781bc E
|
|
|/
|
|
o 0:cd010b8cd998 A
|
|
|
|
|
|
|
|
Test multiple root handling
|
|
------------------------------------
|
|
|
|
$ hg rebase --dest 4 --rev '7+11+9'
|
|
rebasing 7:02de42196ebe "H"
|
|
rebasing 9:cf44d2f5a9f4 "D"
|
|
not rebasing ignored 10:7c6027df6a99 "B"
|
|
rebasing 11:0d8f238b634c "C" (tip)
|
|
$ hg log -G
|
|
o 14:1e8370e38cca C
|
|
|
|
|
| o 13:102b4c1d889b D
|
|
| |
|
|
@ | 12:bfe264faf697 H
|
|
|/
|
|
| o 10:7c6027df6a99 B
|
|
| |
|
|
| x 7:02de42196ebe H
|
|
| |
|
|
+---o 6:eea13746799a G
|
|
| |/
|
|
| o 5:24b6387c8c8c F
|
|
| |
|
|
o | 4:9520eea781bc E
|
|
|/
|
|
o 0:cd010b8cd998 A
|
|
|
|
$ cd ..
|
|
|
|
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)'
|
|
rebasing 3:32af7686d403 "D"
|
|
rebasing 7:02de42196ebe "H"
|
|
not rebasing ignored 8:53a6a128b2b7 "M"
|
|
rebasing 9:4bde274eefcf "I" (tip)
|
|
$ 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
|
|
|
|
|
|
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
|
|
|
|
$ 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"
|
|
|
|
$ 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)
|
|
$ 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)
|
|
|
|
If all the changeset to be rebased are obsolete and present in the destination, we
|
|
should display a friendly error message
|
|
|
|
$ hg log -G
|
|
@ 10:121d9e3bc4c6 P
|
|
|
|
|
o 9:4be60e099a77 C
|
|
|
|
|
o 6:9c48361117de D
|
|
|
|
|
o 2:261e70097290 B2
|
|
|
|
|
o 0:4a2df7238c3b A
|
|
|
|
|
|
$ hg up 9
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo "non-relevant change" > nonrelevant
|
|
$ hg add nonrelevant
|
|
$ hg commit -m nonrelevant
|
|
created new head
|
|
$ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all
|
|
$ hg rebase -r . -d 10
|
|
abort: all requested changesets have equivalents or were marked as obsolete
|
|
(to force the rebase, set the config experimental.rebaseskipobsolete to False)
|
|
[255]
|
|
|
|
If a rebase is going to create divergence, it should abort
|
|
|
|
$ hg log -G
|
|
@ 11:f44da1f4954c nonrelevant
|
|
|
|
|
| o 10:121d9e3bc4c6 P
|
|
|/
|
|
o 9:4be60e099a77 C
|
|
|
|
|
o 6:9c48361117de D
|
|
|
|
|
o 2:261e70097290 B2
|
|
|
|
|
o 0:4a2df7238c3b A
|
|
|
|
|
|
$ hg up 9
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo "john" > doe
|
|
$ hg add doe
|
|
$ hg commit -m "john doe"
|
|
created new head
|
|
$ hg up 10
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo "foo" > bar
|
|
$ hg add bar
|
|
$ hg commit --amend -m "10'"
|
|
$ hg up 10 --hidden
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo "bar" > foo
|
|
$ hg add foo
|
|
$ hg commit -m "bar foo"
|
|
$ hg log -G
|
|
@ 15:73568ab6879d bar foo
|
|
|
|
|
| o 14:77d874d096a2 10'
|
|
| |
|
|
| | o 12:3eb461388009 john doe
|
|
| |/
|
|
x | 10:121d9e3bc4c6 P
|
|
|/
|
|
o 9:4be60e099a77 C
|
|
|
|
|
o 6:9c48361117de D
|
|
|
|
|
o 2:261e70097290 B2
|
|
|
|
|
o 0:4a2df7238c3b A
|
|
|
|
$ hg summary
|
|
parent: 15:73568ab6879d tip
|
|
bar foo
|
|
branch: default
|
|
commit: (clean)
|
|
update: 2 new changesets, 3 branch heads (merge)
|
|
phases: 8 draft
|
|
unstable: 1 changesets
|
|
$ hg rebase -s 10 -d 12
|
|
abort: this rebase will cause divergences from: 121d9e3bc4c6
|
|
(to force the rebase please set experimental.allowdivergence=True)
|
|
[255]
|
|
$ hg log -G
|
|
@ 15:73568ab6879d bar foo
|
|
|
|
|
| o 14:77d874d096a2 10'
|
|
| |
|
|
| | o 12:3eb461388009 john doe
|
|
| |/
|
|
x | 10:121d9e3bc4c6 P
|
|
|/
|
|
o 9:4be60e099a77 C
|
|
|
|
|
o 6:9c48361117de D
|
|
|
|
|
o 2:261e70097290 B2
|
|
|
|
|
o 0:4a2df7238c3b A
|
|
|
|
With experimental.allowdivergence=True, rebase can create divergence
|
|
|
|
$ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True
|
|
rebasing 10:121d9e3bc4c6 "P"
|
|
rebasing 15:73568ab6879d "bar foo" (tip)
|
|
$ hg summary
|
|
parent: 17:61bd55f69bc4 tip
|
|
bar foo
|
|
branch: default
|
|
commit: (clean)
|
|
update: 1 new changesets, 2 branch heads (merge)
|
|
phases: 8 draft
|
|
divergent: 2 changesets
|
|
|