Mercurial > hg
annotate tests/test-rebase-scenario-global.t @ 46370:cad17d50736c
changelog: move branchinfo to changelogrevision
The function parses the extra dictionary after looking up the
changelogrevision. To avoid duplicated look up, it is better to provide
it as property of changelogrevision instead. Keep the function for a
release cycle as at least the topic extension depends on it.
Differential Revision: https://phab.mercurial-scm.org/D9779
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Fri, 15 Jan 2021 01:30:08 +0100 |
parents | b4694ef45db5 |
children | 9989a276712f |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
2 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
3 > rebase= |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
4 > drawdag=$TESTDIR/drawdag.py |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
5 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
6 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
7 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
8 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
9 > [alias] |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
10 > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
11 > EOF |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
12 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
13 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
14 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
15 $ cd a |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15945
diff
changeset
|
16 $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
14118
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
17 adding changesets |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
18 adding manifests |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
19 adding file changes |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
20 added 8 changesets with 7 changes to 7 files (+2 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
36476
diff
changeset
|
21 new changesets cd010b8cd998:02de42196ebe (8 drafts) |
14118
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
23 $ hg up tip |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
24 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
25 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
26 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
27 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
28 Rebasing |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
29 D onto H - simple rebase: |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
30 (this also tests that editor is invoked if '--edit' is specified, and that we |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
31 can abort or warn for colliding untracked files) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
32 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
33 $ hg clone -q -u . a a1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
34 $ cd a1 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
35 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
36 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
37 @ 7: 02de42196ebe 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
38 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
39 | o 6: eea13746799a 'G' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
40 |/| |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
41 o | 5: 24b6387c8c8c 'F' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
42 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
43 | o 4: 9520eea781bc 'E' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
44 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
45 | o 3: 32af7686d403 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
46 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
47 | o 2: 5fddd98957c8 'C' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
48 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
49 | o 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
50 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
51 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
52 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
53 |
21410
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
54 $ hg status --rev "3^1" --rev 3 |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
55 A D |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
56 $ echo collide > D |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
57 $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit --config merge.checkunknown=warn |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
58 rebasing 3:32af7686d403 "D" |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
59 D: replacing untracked file |
21410
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
60 D |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
61 |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
62 |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
63 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
64 HG: Leave message empty to abort commit. |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
65 HG: -- |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
66 HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
5b70ece79ea7
rebase: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
67 HG: branch 'default' |
22895
dfa44e25bb53
dirstate: properly clean-up some more merge state on setparents
Matt Mackall <mpm@selenic.com>
parents:
22183
diff
changeset
|
68 HG: added D |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
69 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
70 $ cat D.orig |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
71 collide |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
72 $ rm D.orig |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
73 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
74 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
75 o 7: 1619f02ff7dd 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
76 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
77 @ 6: 02de42196ebe 'H' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
78 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
79 | o 5: eea13746799a 'G' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
80 |/| |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
81 o | 4: 24b6387c8c8c 'F' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
82 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
83 | o 3: 9520eea781bc 'E' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
84 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
85 | o 2: 5fddd98957c8 'C' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
86 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
87 | o 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
88 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
89 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
90 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
91 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
92 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
93 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
94 D onto F - intermediate point: |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
95 (this also tests that editor is not invoked if '--edit' is not specified, and |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
96 that we can ignore for colliding untracked files) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
97 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
98 $ hg clone -q -u . a a2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
99 $ cd a2 |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
100 $ echo collide > D |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
101 |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
102 $ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
103 rebasing 3:32af7686d403 "D" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
104 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
105 $ cat D.orig |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
106 collide |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
107 $ rm D.orig |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
108 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
109 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
110 o 7: 2107530e74ab 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
111 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
112 | @ 6: 02de42196ebe 'H' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
113 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
114 | o 5: eea13746799a 'G' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
115 |/| |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
116 o | 4: 24b6387c8c8c 'F' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
117 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
118 | o 3: 9520eea781bc 'E' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
119 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
120 | o 2: 5fddd98957c8 'C' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
121 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
122 | o 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
123 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
124 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
125 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
126 $ cd .. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
127 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
128 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
129 E onto H - skip of G: |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
130 (this also tests that we can overwrite untracked files and don't create backups |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
131 if they have the same contents) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
132 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
133 $ hg clone -q -u . a a3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
134 $ cd a3 |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
135 $ hg cat -r 4 E | tee E |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
136 E |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
137 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
138 $ hg rebase -s 4 -d 7 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
139 rebasing 4:9520eea781bc "E" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
140 rebasing 6:eea13746799a "G" |
40865
4edd427f34c1
rebase: clarify that commits that become empty are skipped
Martin von Zweigbergk <martinvonz@google.com>
parents:
40864
diff
changeset
|
141 note: not rebasing 6:eea13746799a "G", its destination already has all its changes |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg |
28022
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
143 $ f E.orig |
e397b58c0563
rebase: respect checkunknown and checkignored in more cases
Siddharth Agarwal <sid0@fb.com>
parents:
26719
diff
changeset
|
144 E.orig: file not found |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
145 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
146 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
147 o 6: 9f8b8ec77260 'E' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
148 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
149 @ 5: 02de42196ebe 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
150 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
151 o 4: 24b6387c8c8c 'F' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
152 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
153 | o 3: 32af7686d403 'D' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
154 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
155 | o 2: 5fddd98957c8 'C' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
156 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
157 | o 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
158 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
159 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
160 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
161 $ cd .. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
162 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
163 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
164 F onto E - rebase of a branching point (skip G): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
165 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
166 $ hg clone -q -u . a a4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
167 $ cd a4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
168 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
169 $ hg rebase -s 5 -d 4 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
170 rebasing 5:24b6387c8c8c "F" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
171 rebasing 6:eea13746799a "G" |
40865
4edd427f34c1
rebase: clarify that commits that become empty are skipped
Martin von Zweigbergk <martinvonz@google.com>
parents:
40864
diff
changeset
|
172 note: not rebasing 6:eea13746799a "G", its destination already has all its changes |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
173 rebasing 7:02de42196ebe tip "H" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
175 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
176 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
177 @ 6: e9240aeaa6ad 'H' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
178 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
179 o 5: 5d0ccadb6e3e 'F' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
180 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
181 o 4: 9520eea781bc 'E' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
182 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
183 | o 3: 32af7686d403 'D' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
184 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
185 | o 2: 5fddd98957c8 'C' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
186 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
187 | o 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
188 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
189 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
190 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
191 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
192 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
193 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
194 G onto H - merged revision having a parent in ancestors of target: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
195 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
196 $ hg clone -q -u . a a5 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
197 $ cd a5 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
198 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
199 $ hg rebase -s 6 -d 7 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
200 rebasing 6:eea13746799a "G" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
201 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
202 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
203 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
204 o 7: 397834907a90 'G' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
205 |\ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
206 | @ 6: 02de42196ebe 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
207 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
208 | o 5: 24b6387c8c8c 'F' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
209 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
210 o | 4: 9520eea781bc 'E' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
211 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
212 | o 3: 32af7686d403 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
213 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
214 | o 2: 5fddd98957c8 'C' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
215 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
216 | o 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
217 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
218 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
219 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
220 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
221 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
222 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
223 F onto B - G maintains E as parent: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
224 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
225 $ hg clone -q -u . a a6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
226 $ cd a6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
227 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
228 $ hg rebase -s 5 -d 1 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
229 rebasing 5:24b6387c8c8c "F" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
230 rebasing 6:eea13746799a "G" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
231 rebasing 7:02de42196ebe tip "H" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
232 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
233 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
234 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
235 @ 7: c87be72f9641 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
236 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
237 | o 6: 17badd73d4f1 'G' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
238 |/| |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
239 o | 5: 74fb9ed646c4 'F' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
240 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
241 | o 4: 9520eea781bc 'E' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
242 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
243 | | o 3: 32af7686d403 'D' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
244 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
245 +---o 2: 5fddd98957c8 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
246 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
247 o | 1: 42ccdea3bb16 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
248 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
249 o 0: cd010b8cd998 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
250 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
251 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
252 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
253 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
254 These will fail (using --source): |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
255 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
256 G onto F - rebase onto an ancestor: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
257 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
258 $ hg clone -q -u . a a7 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
259 $ cd a7 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
260 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
261 $ hg rebase -s 6 -d 5 |
15267
3bfdfefea2fc
rebase: use revset as soon as possible in internal logic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15132
diff
changeset
|
262 nothing to rebase |
3bfdfefea2fc
rebase: use revset as soon as possible in internal logic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15132
diff
changeset
|
263 [1] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
264 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
265 F onto G - rebase onto a descendant: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
266 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
267 $ hg rebase -s 5 -d 6 |
34006 | 268 abort: source and destination form a cycle |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
269 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
270 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
271 G onto B - merge revision with both parents not in ancestors of target: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
272 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
273 $ hg rebase -s 6 -d 1 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
274 rebasing 6:eea13746799a "G" |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33773
diff
changeset
|
275 abort: cannot rebase 6:eea13746799a without moving at least one of its parents |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
276 [255] |
31225
749b057b01f3
rebase: allow aborting if last-message.txt is missing
Durham Goode <durham@fb.com>
parents:
31143
diff
changeset
|
277 $ hg rebase --abort |
749b057b01f3
rebase: allow aborting if last-message.txt is missing
Durham Goode <durham@fb.com>
parents:
31143
diff
changeset
|
278 rebase aborted |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
279 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
280 These will abort gracefully (using --base): |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
281 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
282 G onto G - rebase onto same changeset: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
283 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
284 $ hg rebase -b 6 -d 6 |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
285 nothing to rebase - eea13746799a is both "base" and destination |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
286 [1] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
287 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
288 G onto F - rebase onto an ancestor: |
9578
341182ac95e4
rebase: return early when source is descendant of destination
Sune Foldager <cryo@cyanite.org>
parents:
8168
diff
changeset
|
289 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
290 $ hg rebase -b 6 -d 5 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
291 nothing to rebase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
292 [1] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
293 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
294 F onto G - rebase onto a descendant: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
295 |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
296 $ hg rebase -b 5 -d 6 |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
297 nothing to rebase - "base" 24b6387c8c8c is already an ancestor of destination eea13746799a |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
298 [1] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
299 |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
300 C onto A - rebase onto an ancestor: |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
301 |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
302 $ hg rebase -d 0 -s 2 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
303 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
304 rebasing 3:32af7686d403 "D" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
305 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
306 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
307 o 7: c9659aac0000 'D' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
308 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
309 o 6: e1c4361dd923 'C' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
310 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
311 | @ 5: 02de42196ebe 'H' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
312 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
313 | | o 4: eea13746799a 'G' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
314 | |/| |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
315 | o | 3: 24b6387c8c8c 'F' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
316 |/ / |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
317 | o 2: 9520eea781bc 'E' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
318 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
319 | o 1: 42ccdea3bb16 'B' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
320 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
321 o 0: cd010b8cd998 'A' |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
322 |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
323 |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
324 Check rebasing public changeset |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
325 |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
19059
53eadcb814fd
rebase: check no-op before checking phase (issue3891)
Siddharth Agarwal <sid0@fb.com>
parents:
18644
diff
changeset
|
327 $ hg rebase -d 0 -b 6 |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
328 abort: cannot rebase public changesets |
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
329 (see 'hg help phases' for details) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
330 [10] |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
331 $ hg rebase -d 5 -b 6 |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
332 abort: cannot rebase public changesets |
29966
11604da46982
rebase: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
28189
diff
changeset
|
333 (see 'hg help phases' for details) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
334 [10] |
31302
681046de87f1
rebase: abort if *any* commit in rebase set is public
Martin von Zweigbergk <martinvonz@google.com>
parents:
31225
diff
changeset
|
335 $ hg rebase -d 5 -r '1 + (6::)' |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
336 abort: cannot rebase public changesets |
31302
681046de87f1
rebase: abort if *any* commit in rebase set is public
Martin von Zweigbergk <martinvonz@google.com>
parents:
31225
diff
changeset
|
337 (see 'hg help phases' for details) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
338 [10] |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
339 |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15447
diff
changeset
|
340 $ hg rebase -d 5 -b 6 --keep |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
341 rebasing 6:e1c4361dd923 "C" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
342 rebasing 7:c9659aac0000 tip "D" |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
343 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
344 Check rebasing mutable changeset |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
345 Source phase greater or equal to destination phase: new changeset get the phase of source: |
23440
57d35d3c1cf1
rebase: ignore negative state when updating back to original wc parent
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22895
diff
changeset
|
346 $ hg id -n |
57d35d3c1cf1
rebase: ignore negative state when updating back to original wc parent
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22895
diff
changeset
|
347 5 |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
348 $ hg rebase -s9 -d0 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
349 rebasing 9:2b23e52411f4 tip "D" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
350 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg |
23440
57d35d3c1cf1
rebase: ignore negative state when updating back to original wc parent
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22895
diff
changeset
|
351 $ hg id -n # check we updated back to parent |
57d35d3c1cf1
rebase: ignore negative state when updating back to original wc parent
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22895
diff
changeset
|
352 5 |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
353 $ hg log --template "{phase}\n" -r 9 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
354 draft |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
355 $ hg rebase -s9 -d1 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
356 rebasing 9:2cb10d0cfc6c tip "D" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
357 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
358 $ hg log --template "{phase}\n" -r 9 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
359 draft |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
360 $ hg phase --force --secret 9 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
361 $ hg rebase -s9 -d0 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
362 rebasing 9:c5b12b67163a tip "D" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
363 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
364 $ hg log --template "{phase}\n" -r 9 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
365 secret |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
366 $ hg rebase -s9 -d1 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
367 rebasing 9:2a0524f868ac tip "D" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
368 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
369 $ hg log --template "{phase}\n" -r 9 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
370 secret |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
371 Source phase lower than destination phase: new changeset get the phase of destination: |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
372 $ hg rebase -s8 -d9 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
373 rebasing 8:6d4f22462821 "C" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
374 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
375 $ hg log --template "{phase}\n" -r 'rev(9)' |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
376 secret |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
377 |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
378 $ cd .. |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14119
diff
changeset
|
379 |
34143
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
380 Check that temporary bundle doesn't lose phase when not using generaldelta |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
381 |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
382 $ hg --config format.usegeneraldelta=no init issue5678 |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
383 $ cd issue5678 |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
384 $ grep generaldelta .hg/requires |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
385 [1] |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
386 $ echo a > a |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
387 $ hg ci -Aqm a |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
388 $ echo b > b |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
389 $ hg ci -Aqm b |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
390 $ hg co -q '.^' |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
391 $ echo c > c |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
392 $ hg ci -Aqm c |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
393 $ hg phase --public |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
394 $ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n' |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
395 @ 2:d36c public c |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
396 | |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
397 | o 1:d2ae draft b |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
398 |/ |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
399 o 0:cb9a public a |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
400 |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
401 $ hg rebase -s 1 -d 2 |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
402 rebasing 1:d2ae7f538514 "b" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
403 saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg |
34143
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
404 $ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n' |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
405 o 2:c882 draft b |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
406 | |
34144
91f0677dc920
repair: preserve phase also when not using generaldelta (issue5678)
Martin von Zweigbergk <martinvonz@google.com>
parents:
34143
diff
changeset
|
407 @ 1:d36c public c |
34143
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
408 | |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
409 o 0:cb9a public a |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
410 |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
411 $ cd .. |
b5d7e7d5c573
tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents:
33338
diff
changeset
|
412 |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
413 Test for revset |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
414 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
415 We need a bit different graph |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
416 All destination are B |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
417 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
418 $ hg init ah |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
419 $ cd ah |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15945
diff
changeset
|
420 $ hg unbundle "$TESTDIR/bundles/rebase-revset.hg" |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
421 adding changesets |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
422 adding manifests |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
423 adding file changes |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
424 added 9 changesets with 9 changes to 9 files (+2 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
36476
diff
changeset
|
425 new changesets 9ae2ed22e576:479ddb54a924 (9 drafts) |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
426 (run 'hg heads' to see heads, 'hg merge' to merge) |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
427 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
428 o 8: 479ddb54a924 'I' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
429 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
430 o 7: 72434a4e60b0 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
431 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
432 o 6: 3d8a618087a7 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
433 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
434 | o 5: 41bfcc75ed73 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
435 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
436 | o 4: c01897464e7f 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
437 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
438 o 3: ffd453c31098 'D' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
439 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
440 o 2: c9e50f6cdc55 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
441 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
442 | o 1: 8fd0f7e49f53 'B' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
443 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
444 o 0: 9ae2ed22e576 'A' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
445 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
446 $ cd .. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
447 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
448 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
449 Simple case with keep: |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
450 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
451 Source on have two descendant heads but ask for one |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
452 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
453 $ hg clone -q -u . ah ah1 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
454 $ cd ah1 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
455 $ hg rebase -r '2::8' -d 1 |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
456 abort: cannot rebase changeset with children |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
457 (use --keep to keep original changesets) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
458 [10] |
25025
72f7f98bc5e5
rebase: add short -k option for --keep
Nat Mote <nmote@fb.com>
parents:
23917
diff
changeset
|
459 $ hg rebase -r '2::8' -d 1 -k |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
460 rebasing 2:c9e50f6cdc55 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
461 rebasing 3:ffd453c31098 "D" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
462 rebasing 6:3d8a618087a7 "G" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
463 rebasing 7:72434a4e60b0 "H" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
464 rebasing 8:479ddb54a924 tip "I" |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
465 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
466 o 13: 9bf1d9358a90 'I' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
467 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
468 o 12: 274623a778d4 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
469 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
470 o 11: ab8c8617c8e8 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
471 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
472 o 10: c8cbf59f70da 'D' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
473 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
474 o 9: 563e4faab485 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
475 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
476 | o 8: 479ddb54a924 'I' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
477 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
478 | o 7: 72434a4e60b0 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
479 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
480 | o 6: 3d8a618087a7 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
481 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
482 | | o 5: 41bfcc75ed73 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
483 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
484 | | o 4: c01897464e7f 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
485 | |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
486 | o 3: ffd453c31098 'D' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
487 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
488 | o 2: c9e50f6cdc55 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
489 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
490 o | 1: 8fd0f7e49f53 'B' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
491 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
492 o 0: 9ae2ed22e576 'A' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
493 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
494 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
495 $ cd .. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
496 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
497 Base on have one descendant heads we ask for but common ancestor have two |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
498 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
499 $ hg clone -q -u . ah ah2 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
500 $ cd ah2 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
501 $ hg rebase -r '3::8' -d 1 |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
502 abort: cannot rebase changeset with children |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
503 (use --keep to keep original changesets) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
504 [10] |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
505 $ hg rebase -r '3::8' -d 1 --keep |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
506 rebasing 3:ffd453c31098 "D" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
507 rebasing 6:3d8a618087a7 "G" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
508 rebasing 7:72434a4e60b0 "H" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
509 rebasing 8:479ddb54a924 tip "I" |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
510 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
511 o 12: 9d7da0053b1c 'I' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
512 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
513 o 11: 8fbd00952cbc 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
514 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
515 o 10: 51d434a615ee 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
516 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
517 o 9: a9c125634b0b 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
518 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
519 | o 8: 479ddb54a924 'I' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
520 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
521 | o 7: 72434a4e60b0 'H' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
522 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
523 | o 6: 3d8a618087a7 'G' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
524 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
525 | | o 5: 41bfcc75ed73 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
526 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
527 | | o 4: c01897464e7f 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
528 | |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
529 | o 3: ffd453c31098 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
530 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
531 | o 2: c9e50f6cdc55 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
532 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
533 o | 1: 8fd0f7e49f53 'B' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
534 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
535 o 0: 9ae2ed22e576 'A' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
536 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
537 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
538 $ cd .. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
539 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
540 rebase subset |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
541 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
542 $ hg clone -q -u . ah ah3 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
543 $ cd ah3 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
544 $ hg rebase -r '3::7' -d 1 |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
545 abort: cannot rebase changeset with children |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
546 (use --keep to keep original changesets) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
547 [10] |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
548 $ hg rebase -r '3::7' -d 1 --keep |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
549 rebasing 3:ffd453c31098 "D" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
550 rebasing 6:3d8a618087a7 "G" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
551 rebasing 7:72434a4e60b0 "H" |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
552 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
553 o 11: 8fbd00952cbc 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
554 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
555 o 10: 51d434a615ee 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
556 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
557 o 9: a9c125634b0b 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
558 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
559 | o 8: 479ddb54a924 'I' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
560 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
561 | o 7: 72434a4e60b0 'H' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
562 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
563 | o 6: 3d8a618087a7 'G' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
564 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
565 | | o 5: 41bfcc75ed73 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
566 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
567 | | o 4: c01897464e7f 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
568 | |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
569 | o 3: ffd453c31098 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
570 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
571 | o 2: c9e50f6cdc55 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
572 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
573 o | 1: 8fd0f7e49f53 'B' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
574 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
575 o 0: 9ae2ed22e576 'A' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
576 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
577 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
578 $ cd .. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
579 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
580 rebase subset with multiple head |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
581 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
582 $ hg clone -q -u . ah ah4 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
583 $ cd ah4 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
584 $ hg rebase -r '3::(7+5)' -d 1 |
43934
71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents:
40865
diff
changeset
|
585 abort: cannot rebase changeset with children |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
586 (use --keep to keep original changesets) |
45853
b4694ef45db5
errors: raise more specific errors from rewriteutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
587 [10] |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
588 $ hg rebase -r '3::(7+5)' -d 1 --keep |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
589 rebasing 3:ffd453c31098 "D" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
590 rebasing 4:c01897464e7f "E" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
591 rebasing 5:41bfcc75ed73 "F" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
592 rebasing 6:3d8a618087a7 "G" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
593 rebasing 7:72434a4e60b0 "H" |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
594 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
595 o 13: 8fbd00952cbc 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
596 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
597 o 12: 51d434a615ee 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
598 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
599 | o 11: df23d8bda0b7 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
600 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
601 | o 10: 47b7889448ff 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
602 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
603 o 9: a9c125634b0b 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
604 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
605 | o 8: 479ddb54a924 'I' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
606 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
607 | o 7: 72434a4e60b0 'H' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
608 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
609 | o 6: 3d8a618087a7 'G' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
610 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
611 | | o 5: 41bfcc75ed73 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
612 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
613 | | o 4: c01897464e7f 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
614 | |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
615 | o 3: ffd453c31098 'D' |
17005
50f434510da6
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16540
diff
changeset
|
616 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
617 | o 2: c9e50f6cdc55 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
618 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
619 o | 1: 8fd0f7e49f53 'B' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
620 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
621 o 0: 9ae2ed22e576 'A' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
622 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
623 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
624 $ cd .. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
625 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
626 More advanced tests |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
627 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
628 rebase on ancestor with revset |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
629 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
630 $ hg clone -q -u . ah ah5 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
631 $ cd ah5 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
632 $ hg rebase -r '6::' -d 2 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
633 rebasing 6:3d8a618087a7 "G" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
634 rebasing 7:72434a4e60b0 "H" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
635 rebasing 8:479ddb54a924 tip "I" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
636 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
637 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
638 o 8: fcb52e68a694 'I' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
639 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
640 o 7: 77bd65cd7600 'H' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
641 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
642 o 6: 12d0e738fb18 'G' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
643 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
644 | o 5: 41bfcc75ed73 'F' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
645 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
646 | o 4: c01897464e7f 'E' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
647 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
648 | o 3: ffd453c31098 'D' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
649 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
650 o 2: c9e50f6cdc55 'C' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
651 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
652 | o 1: 8fd0f7e49f53 'B' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
653 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
654 o 0: 9ae2ed22e576 'A' |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
655 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
656 $ cd .. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
657 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
658 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
659 rebase with multiple root. |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
660 We rebase E and G on B |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
661 We would expect heads are I, F if it was supported |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
662 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
663 $ hg clone -q -u . ah ah6 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
664 $ cd ah6 |
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
665 $ hg rebase -r '(4+6)::' -d 1 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
666 rebasing 4:c01897464e7f "E" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
667 rebasing 5:41bfcc75ed73 "F" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
668 rebasing 6:3d8a618087a7 "G" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
669 rebasing 7:72434a4e60b0 "H" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
670 rebasing 8:479ddb54a924 tip "I" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
671 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
672 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
673 o 8: 9136df9a87cf 'I' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
674 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
675 o 7: 23e8f30da832 'H' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
676 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
677 o 6: b0efe8534e8b 'G' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
678 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
679 | o 5: 6eb5b496ab79 'F' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
680 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
681 | o 4: d15eade9b0b1 'E' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
682 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
683 | o 3: ffd453c31098 'D' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
684 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
685 | o 2: c9e50f6cdc55 'C' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
686 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
687 o | 1: 8fd0f7e49f53 'B' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
688 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
689 o 0: 9ae2ed22e576 'A' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
690 |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
691 $ cd .. |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
692 |
18644
3e92772d5383
spelling: fix some minor issues found by spell checker
Mads Kiilerich <mads@kiilerich.com>
parents:
18424
diff
changeset
|
693 More complex rebase with multiple roots |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
694 each root have a different common ancestor with the destination and this is a detach |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
695 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
696 (setup) |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
697 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
698 $ hg clone -q -u . a a8 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
699 $ cd a8 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
700 $ echo I > I |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
701 $ hg add I |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
702 $ hg commit -m I |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
703 $ hg up 4 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
704 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
705 $ echo I > J |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
706 $ hg add J |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
707 $ hg commit -m J |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
708 created new head |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
709 $ echo I > K |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
710 $ hg add K |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
711 $ hg commit -m K |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
712 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
713 @ 10: 23a4ace37988 'K' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
714 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
715 o 9: 1301922eeb0c 'J' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
716 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
717 | o 8: e7ec4e813ba6 'I' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
718 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
719 | o 7: 02de42196ebe 'H' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
720 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
721 +---o 6: eea13746799a 'G' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
722 | |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
723 | o 5: 24b6387c8c8c 'F' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
724 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
725 o | 4: 9520eea781bc 'E' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
726 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
727 | o 3: 32af7686d403 'D' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
728 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
729 | o 2: 5fddd98957c8 'C' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
730 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
731 | o 1: 42ccdea3bb16 'B' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
732 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
733 o 0: cd010b8cd998 'A' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
734 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
735 (actual test) |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
736 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
737 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
738 rebasing 8:e7ec4e813ba6 "I" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
739 rebasing 10:23a4ace37988 tip "K" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
740 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
741 $ hg log --rev 'children(desc(G))' |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
742 changeset: 9:adb617877056 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
743 parent: 6:eea13746799a |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
744 user: test |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
745 date: Thu Jan 01 00:00:00 1970 +0000 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
746 summary: I |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
747 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
748 changeset: 10:882431a34a0e |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
749 tag: tip |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
750 parent: 6:eea13746799a |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
751 user: test |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
752 date: Thu Jan 01 00:00:00 1970 +0000 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
753 summary: K |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
754 |
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
755 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
756 @ 10: 882431a34a0e 'K' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
757 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
758 | o 9: adb617877056 'I' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
759 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
760 | o 8: 1301922eeb0c 'J' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
761 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
762 | | o 7: 02de42196ebe 'H' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
763 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
764 o---+ 6: eea13746799a 'G' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
765 |/ / |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
766 | o 5: 24b6387c8c8c 'F' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
767 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
768 o | 4: 9520eea781bc 'E' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
769 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
770 | o 3: 32af7686d403 'D' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
771 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
772 | o 2: 5fddd98957c8 'C' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
773 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
774 | o 1: 42ccdea3bb16 'B' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
775 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
776 o 0: cd010b8cd998 'A' |
18424
100fdc84670f
rebase: support multiple roots for rebaseset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17029
diff
changeset
|
777 |
20335
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
778 |
22183
4dd9f606d0a6
tests: fixup issue markers to make check-commit happy
Matt Mackall <mpm@selenic.com>
parents:
21410
diff
changeset
|
779 Test that rebase is not confused by $CWD disappearing during rebase (issue4121) |
20335
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
780 |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
781 $ cd .. |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
782 $ hg init cwd-vanish |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
783 $ cd cwd-vanish |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
784 $ touch initial-file |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
785 $ hg add initial-file |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
786 $ hg commit -m 'initial commit' |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
787 $ touch dest-file |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
788 $ hg add dest-file |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
789 $ hg commit -m 'dest commit' |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
790 $ hg up 0 |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
791 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
792 $ touch other-file |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
793 $ hg add other-file |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
794 $ hg commit -m 'first source commit' |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
795 created new head |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
796 $ mkdir subdir |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
797 $ cd subdir |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
798 $ touch subfile |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
799 $ hg add subfile |
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
800 $ hg commit -m 'second source with subdir' |
33338
ad124b3208fd
test-rebase: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33337
diff
changeset
|
801 |
20335
e40520642e64
rebase: do not crash in panic when cwd disapear in the process (issue4121)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20249
diff
changeset
|
802 $ hg rebase -b . -d 1 --traceback |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
803 rebasing 2:779a07b1b7a0 "first source commit" |
33338
ad124b3208fd
test-rebase: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33337
diff
changeset
|
804 current directory was removed (rmcwd !) |
ad124b3208fd
test-rebase: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33337
diff
changeset
|
805 (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !) |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
806 rebasing 3:a7d6f3a00bf3 tip "second source with subdir" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
807 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
808 |
30849
763031a7690d
tests: use an absolute path to get around '..' being invalid on a dead CWD
Augie Fackler <augie@google.com>
parents:
30332
diff
changeset
|
809 Get back to the root of cwd-vanish. Note that even though `cd ..` |
763031a7690d
tests: use an absolute path to get around '..' being invalid on a dead CWD
Augie Fackler <augie@google.com>
parents:
30332
diff
changeset
|
810 works on most systems, it does not work on FreeBSD 10, so we use an |
763031a7690d
tests: use an absolute path to get around '..' being invalid on a dead CWD
Augie Fackler <augie@google.com>
parents:
30332
diff
changeset
|
811 absolute path to get back to the repository. |
31143
628600bf55e4
tests: un-nest the `order` repo in test-rebase-scenario-global
Augie Fackler <augie@google.com>
parents:
30849
diff
changeset
|
812 $ cd $TESTTMP |
30849
763031a7690d
tests: use an absolute path to get around '..' being invalid on a dead CWD
Augie Fackler <augie@google.com>
parents:
30332
diff
changeset
|
813 |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
814 Test that rebase is done in topo order (issue5370) |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
815 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
816 $ hg init order |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
817 $ cd order |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
818 $ touch a && hg add a && hg ci -m A |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
819 $ touch b && hg add b && hg ci -m B |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
820 $ touch c && hg add c && hg ci -m C |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
821 $ hg up 1 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
822 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
823 $ touch d && hg add d && hg ci -m D |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
824 created new head |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
825 $ hg up 2 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
826 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
827 $ touch e && hg add e && hg ci -m E |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
828 $ hg up 3 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
829 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
830 $ touch f && hg add f && hg ci -m F |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
831 $ hg up 0 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
832 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
833 $ touch g && hg add g && hg ci -m G |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
834 created new head |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
835 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
836 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
837 @ 6: 124bb27b6f28 'G' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
838 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
839 | o 5: 412b391de760 'F' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
840 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
841 | | o 4: 82ae8dc7a9b7 'E' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
842 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
843 | o | 3: ab709c9f7171 'D' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
844 | | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
845 | | o 2: d84f5cfaaf14 'C' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
846 | |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
847 | o 1: 76035bbd54bd 'B' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
848 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
849 o 0: 216878401574 'A' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
850 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
851 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
852 $ hg rebase -s 1 -d 6 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
853 rebasing 1:76035bbd54bd "B" |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
854 rebasing 2:d84f5cfaaf14 "C" |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
855 rebasing 4:82ae8dc7a9b7 "E" |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
856 rebasing 3:ab709c9f7171 "D" |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
857 rebasing 5:412b391de760 "F" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35385
diff
changeset
|
858 saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
859 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
860 $ hg tglog |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
861 o 6: 31884cfb735e 'F' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
862 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
863 o 5: 6d89fa5b0909 'D' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
864 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
865 | o 4: de64d97c697b 'E' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
866 | | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
867 | o 3: b18e4d2d0aa1 'C' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
868 |/ |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
869 o 2: 0983daf9ff6a 'B' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
870 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
871 @ 1: 124bb27b6f28 'G' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
872 | |
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
873 o 0: 216878401574 'A' |
30007
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
874 |
aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
Xidorn Quan <me@upsuper.org>
parents:
29966
diff
changeset
|
875 |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
876 Test experimental revset |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
877 ======================== |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
878 |
31143
628600bf55e4
tests: un-nest the `order` repo in test-rebase-scenario-global
Augie Fackler <augie@google.com>
parents:
30849
diff
changeset
|
879 $ cd ../cwd-vanish |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
880 |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
30230
diff
changeset
|
881 Make the repo a bit more interesting |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
882 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
883 $ hg up 1 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
884 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
885 $ echo aaa > aaa |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
886 $ hg add aaa |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
887 $ hg commit -m aaa |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
888 created new head |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
889 $ hg log -G |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
890 @ changeset: 4:5f7bc9025ed2 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
891 | tag: tip |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
892 | parent: 1:58d79cc1cf43 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
893 | user: test |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
894 | date: Thu Jan 01 00:00:00 1970 +0000 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
895 | summary: aaa |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
896 | |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
897 | o changeset: 3:1910d5ff34ea |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
898 | | user: test |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
899 | | date: Thu Jan 01 00:00:00 1970 +0000 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
900 | | summary: second source with subdir |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
901 | | |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
902 | o changeset: 2:82901330b6ef |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
903 |/ user: test |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
904 | date: Thu Jan 01 00:00:00 1970 +0000 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
905 | summary: first source commit |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
906 | |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
907 o changeset: 1:58d79cc1cf43 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
908 | user: test |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
909 | date: Thu Jan 01 00:00:00 1970 +0000 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
910 | summary: dest commit |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
911 | |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
912 o changeset: 0:e94b687f7da3 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
913 user: test |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
914 date: Thu Jan 01 00:00:00 1970 +0000 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
915 summary: initial commit |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
916 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
917 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
918 Testing from lower head |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
919 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
920 $ hg up 3 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
921 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
922 $ hg log -r '_destrebase()' |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
923 changeset: 4:5f7bc9025ed2 |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
924 tag: tip |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
925 parent: 1:58d79cc1cf43 |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
926 user: test |
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
927 date: Thu Jan 01 00:00:00 1970 +0000 |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
928 summary: aaa |
26719
8bed1eae99df
rebase: rename and test '_destrebase'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25411
diff
changeset
|
929 |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
930 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
931 Testing from upper head |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
932 |
28189
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
933 $ hg log -r '_destrebase(4)' |
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
934 changeset: 3:1910d5ff34ea |
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
935 user: test |
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
936 date: Thu Jan 01 00:00:00 1970 +0000 |
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
937 summary: second source with subdir |
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
938 |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
939 $ hg up 4 |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
940 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
941 $ hg log -r '_destrebase()' |
28189
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
942 changeset: 3:1910d5ff34ea |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
943 user: test |
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
944 date: Thu Jan 01 00:00:00 1970 +0000 |
28189
fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28135
diff
changeset
|
945 summary: second source with subdir |
28135
ecfa82447162
tests: have a more elaborated test for _destrebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28022
diff
changeset
|
946 |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
947 Testing rebase being called inside another transaction |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
948 |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
949 $ cd $TESTTMP |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
950 $ hg init tr-state |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
951 $ cd tr-state |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
952 $ cat > $TESTTMP/wraprebase.py <<EOF |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
953 > from __future__ import absolute_import |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
954 > from mercurial import extensions |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
955 > def _rebase(orig, ui, repo, *args, **kwargs): |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
956 > with repo.wlock(): |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
957 > with repo.lock(): |
36476
263368dc143f
py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
958 > with repo.transaction(b'wrappedrebase'): |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
959 > return orig(ui, repo, *args, **kwargs) |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
960 > def wraprebase(loaded): |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
961 > assert loaded |
36476
263368dc143f
py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
962 > rebasemod = extensions.find(b'rebase') |
263368dc143f
py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
963 > extensions.wrapcommand(rebasemod.cmdtable, b'rebase', _rebase) |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
964 > def extsetup(ui): |
36476
263368dc143f
py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
965 > extensions.afterloaded(b'rebase', wraprebase) |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
966 > EOF |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
967 |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
968 $ cat >> .hg/hgrc <<EOF |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
969 > [extensions] |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
970 > wraprebase=$TESTTMP/wraprebase.py |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
971 > [experimental] |
34865
a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
972 > evolution=true |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
973 > EOF |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
974 |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
975 $ hg debugdrawdag <<'EOS' |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
976 > B C |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
977 > |/ |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
978 > A |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
979 > EOS |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
980 |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
981 $ hg rebase -s C -d B |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
43934
diff
changeset
|
982 rebasing 2:dc0947a82db8 C tip "C" |
33055
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
983 |
be3584712b20
test-rebase: add a test showing rebasestate left behind
Jun Wu <quark@fb.com>
parents:
31514
diff
changeset
|
984 $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist' |
33056
2312e70cf78b
rebase: clean up rebasestate from active transaction
Jun Wu <quark@fb.com>
parents:
33055
diff
changeset
|
985 [1] |