Mercurial > hg
annotate tests/test-rebase-parameters.t @ 34980:705d0f2bb677 stable
pathutil: add doctests for canonpath()
This is a followup to f445b10dc7fb. Since there's no way to ensure that more
drive letters than C: exist, this seems like the only way to test it. This is
enough to catch the f445b10dc7fb scenario, as well as CWD outside of the repo
when the path isn't prefixed with path/to/repo.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 03 Nov 2017 22:22:50 -0400 |
parents | eb586ed5d8ce |
children | 469b06b4c3ca |
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= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
4 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15270
diff
changeset
|
5 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15270
diff
changeset
|
6 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15270
diff
changeset
|
7 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
8 > [alias] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
9 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
10 > EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
11 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
12 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
13 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
14 $ cd a |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15742
diff
changeset
|
15 $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
16 adding changesets |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
17 adding manifests |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
18 adding file changes |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
19 added 8 changesets with 7 changes to 7 files (+2 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33332
diff
changeset
|
20 new changesets cd010b8cd998:02de42196ebe |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
21 (run 'hg heads' to see heads, 'hg merge' to merge) |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
22 $ hg up tip |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
23 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
|
24 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
25 $ echo I > I |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
26 $ hg ci -AmI |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
27 adding I |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
28 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
29 $ hg tglog |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
30 @ 8: 'I' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
31 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
32 o 7: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
33 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
34 | o 6: 'G' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
35 |/| |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
36 o | 5: 'F' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
37 | | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
38 | o 4: 'E' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
39 |/ |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
40 | o 3: 'D' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
41 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
42 | o 2: 'C' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
43 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
44 | o 1: 'B' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
45 |/ |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
46 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
47 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
48 $ cd .. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
49 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
50 Version with only two heads (to allow default destination to work) |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
51 |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
52 $ hg clone -q -u . a a2heads -r 3 -r 8 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
53 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
54 These fail: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
55 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
56 $ hg clone -q -u . a a0 |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
57 $ cd a0 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
58 |
14123
7d1b637738a3
tests: move testcase from rebase-named-branches to rebase-parameters
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14122
diff
changeset
|
59 $ hg rebase -s 8 -d 7 |
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
|
60 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
|
61 [1] |
14123
7d1b637738a3
tests: move testcase from rebase-named-branches to rebase-parameters
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14122
diff
changeset
|
62 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
63 $ hg rebase --continue --abort |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
64 abort: cannot use both abort and continue |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
65 [255] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
66 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
67 $ hg rebase --continue --collapse |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
68 abort: cannot use collapse with continue or abort |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
69 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
70 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
71 $ hg rebase --continue --dest 4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
72 abort: abort and continue do not allow specifying revisions |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
73 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
74 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
75 $ hg rebase --base 5 --source 4 |
15270
6cb6064f1d50
rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15267
diff
changeset
|
76 abort: cannot specify both a source and a base |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
77 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
78 |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
79 $ hg rebase --rev 5 --source 4 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
80 abort: cannot specify both a revision and a source |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
81 [255] |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
82 $ hg rebase --base 5 --rev 4 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
83 abort: cannot specify both a revision and a base |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
84 [255] |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
85 |
28190
e8d1460e2a72
rebase: explicitly test abort from ambiguous destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28122
diff
changeset
|
86 $ hg rebase --base 6 |
e8d1460e2a72
rebase: explicitly test abort from ambiguous destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28122
diff
changeset
|
87 abort: branch 'default' has 3 heads - please rebase to an explicit rev |
e8d1460e2a72
rebase: explicitly test abort from ambiguous destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28122
diff
changeset
|
88 (run 'hg heads .' to see heads) |
e8d1460e2a72
rebase: explicitly test abort from ambiguous destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28122
diff
changeset
|
89 [255] |
e8d1460e2a72
rebase: explicitly test abort from ambiguous destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28122
diff
changeset
|
90 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
91 $ hg rebase --rev '1 & !1' --dest 8 |
21197
cb4223c65f79
rebase: don't abort if we're asked to rebase an empty revset
Julien Cristau <julien.cristau@logilab.fr>
parents:
20249
diff
changeset
|
92 empty "rev" revision set - nothing to rebase |
cb4223c65f79
rebase: don't abort if we're asked to rebase an empty revset
Julien Cristau <julien.cristau@logilab.fr>
parents:
20249
diff
changeset
|
93 [1] |
20247
a259f7b488ab
rebase: improve error message for empty --rev set
Mads Kiilerich <madski@unity3d.com>
parents:
20246
diff
changeset
|
94 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
95 $ hg rebase --source '1 & !1' --dest 8 |
21210
799c494189a9
rebase: empty revset should be a gentle no-op with exit code 1, not an error
Mads Kiilerich <madski@unity3d.com>
parents:
21197
diff
changeset
|
96 empty "source" revision set - nothing to rebase |
799c494189a9
rebase: empty revset should be a gentle no-op with exit code 1, not an error
Mads Kiilerich <madski@unity3d.com>
parents:
21197
diff
changeset
|
97 [1] |
20248
3bff26f67169
rebase: improve error message for empty --source set
Mads Kiilerich <madski@unity3d.com>
parents:
20247
diff
changeset
|
98 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
99 $ hg rebase --base '1 & !1' --dest 8 |
21210
799c494189a9
rebase: empty revset should be a gentle no-op with exit code 1, not an error
Mads Kiilerich <madski@unity3d.com>
parents:
21197
diff
changeset
|
100 empty "base" revision set - can't compute rebase set |
799c494189a9
rebase: empty revset should be a gentle no-op with exit code 1, not an error
Mads Kiilerich <madski@unity3d.com>
parents:
21197
diff
changeset
|
101 [1] |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
102 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
103 $ hg rebase --dest 8 |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
104 nothing to rebase - working directory parent is also destination |
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
105 [1] |
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
106 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
107 $ hg rebase -b . --dest 8 |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
108 nothing to rebase - e7ec4e813ba6 is both "base" and destination |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
109 [1] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
110 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
111 $ hg up -q 7 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
112 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
113 $ hg rebase --dest 8 --traceback |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
114 nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6 |
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
115 [1] |
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
116 |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
117 $ hg rebase --dest 8 -b. |
20249
dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Mads Kiilerich <madski@unity3d.com>
parents:
20248
diff
changeset
|
118 nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
119 [1] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
120 |
20246
e4dc4c89b03a
rebase: test for empty dest revision
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
121 $ hg rebase --dest '1 & !1' |
e4dc4c89b03a
rebase: test for empty dest revision
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
122 abort: empty revision set |
e4dc4c89b03a
rebase: test for empty dest revision
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
123 [255] |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
124 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
125 These work: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
126 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
127 Rebase with no arguments (from 3 onto 8): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
128 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
129 $ cd .. |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
130 $ hg clone -q -u . a2heads a1 |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
131 $ cd a1 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
132 $ hg up -q -C 3 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
133 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
134 $ hg rebase |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
135 rebasing 1:42ccdea3bb16 "B" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
136 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
137 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
138 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
139 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
140 $ hg tglog |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
141 @ 6: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
142 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
143 o 5: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
144 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
145 o 4: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
146 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
147 o 3: 'I' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
148 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
149 o 2: 'H' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
150 | |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
151 o 1: 'F' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
152 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
153 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
154 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
155 Try to rollback after a rebase (fail): |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
156 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
157 $ hg rollback |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
158 no rollback information available |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
159 [1] |
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 .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
162 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
163 Rebase with base == '.' => same as no arguments (from 3 onto 8): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
164 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
165 $ hg clone -q -u 3 a2heads a2 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
166 $ cd a2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
167 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
168 $ hg rebase --base . |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
169 rebasing 1:42ccdea3bb16 "B" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
170 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
171 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
172 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
173 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
174 $ hg tglog |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
175 @ 6: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
176 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
177 o 5: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
178 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
179 o 4: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
180 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
181 o 3: 'I' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
182 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
183 o 2: 'H' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
184 | |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
185 o 1: 'F' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
186 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
187 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
188 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
189 $ cd .. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
190 |
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
191 |
16566
ae6dddffe4f1
rebase: make --dest understand revsets
Patrick Mezard <patrick@mezard.eu>
parents:
16550
diff
changeset
|
192 Rebase with dest == branch(.) => same as no arguments (from 3 onto 8): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
193 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
194 $ hg clone -q -u 3 a a3 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
195 $ cd a3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
196 |
16566
ae6dddffe4f1
rebase: make --dest understand revsets
Patrick Mezard <patrick@mezard.eu>
parents:
16550
diff
changeset
|
197 $ hg rebase --dest 'branch(.)' |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
198 rebasing 1:42ccdea3bb16 "B" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
199 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
200 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
201 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
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 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
204 @ 8: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
205 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
206 o 7: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
207 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
208 o 6: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
209 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
210 o 5: 'I' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
211 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
212 o 4: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
213 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
214 | o 3: 'G' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
215 |/| |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
216 o | 2: 'F' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
217 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
218 | o 1: 'E' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
219 |/ |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
220 o 0: 'A' |
12608
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 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
223 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
224 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
225 Specify only source (from 2 onto 8): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
226 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
227 $ hg clone -q -u . a2heads a4 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
228 $ cd a4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
229 |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
230 $ hg rebase --source 'desc("C")' |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
231 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
232 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
233 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
234 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
235 $ hg tglog |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
236 o 6: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
237 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
238 o 5: '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:
16913
diff
changeset
|
239 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
240 @ 4: '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:
16913
diff
changeset
|
241 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
242 o 3: 'H' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
243 | |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
244 o 2: 'F' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
245 | |
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:
16913
diff
changeset
|
246 | o 1: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
247 |/ |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
248 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
249 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
250 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
251 |
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 Specify only dest (from 3 onto 6): |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
254 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
255 $ hg clone -q -u 3 a a5 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
256 $ cd a5 |
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 rebase --dest 6 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
259 rebasing 1:42ccdea3bb16 "B" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
260 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
261 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
262 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
7130
204c7850c158
rebase: disable rollback after rebasing
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6939
diff
changeset
|
263 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
264 $ hg tglog |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
265 @ 8: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
266 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
267 o 7: 'C' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
268 | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
269 o 6: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
270 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
271 | o 5: 'I' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
272 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
273 | o 4: 'H' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
274 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
275 o | 3: 'G' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
276 |\| |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
277 | o 2: 'F' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
278 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
279 o | 1: 'E' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
280 |/ |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
281 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
282 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
283 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
284 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
285 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
286 Specify only base (from 1 onto 8): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
287 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
288 $ hg clone -q -u . a2heads a6 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
289 $ cd a6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
290 |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
291 $ hg rebase --base 'desc("D")' |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
292 rebasing 1:42ccdea3bb16 "B" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
293 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
294 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
295 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
296 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
297 $ hg tglog |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
298 o 6: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
299 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
300 o 5: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
301 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
302 o 4: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
303 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
304 @ 3: 'I' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
305 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
306 o 2: 'H' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
307 | |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
308 o 1: 'F' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
309 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
310 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
311 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
312 $ cd .. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
313 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
314 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
315 Specify source and dest (from 2 onto 7): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
316 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
317 $ hg clone -q -u . a a7 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
318 $ cd a7 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
319 |
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:
16913
diff
changeset
|
320 $ hg rebase --source 2 --dest 7 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
321 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
322 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
323 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
324 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
325 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19214
diff
changeset
|
326 o 8: 'D' |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
327 | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
328 o 7: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
329 | |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19214
diff
changeset
|
330 | @ 6: 'I' |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
331 |/ |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
332 o 5: 'H' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
333 | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
334 | o 4: 'G' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
335 |/| |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
336 o | 3: 'F' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
337 | | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
338 | o 2: 'E' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
339 |/ |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
340 | o 1: 'B' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
341 |/ |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
342 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
343 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
344 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
345 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
346 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
347 Specify base and dest (from 1 onto 7): |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
348 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
349 $ hg clone -q -u . a a8 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
350 $ cd a8 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
351 |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
352 $ hg rebase --base 3 --dest 7 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
353 rebasing 1:42ccdea3bb16 "B" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
354 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
355 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
356 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
357 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
358 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19214
diff
changeset
|
359 o 8: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
360 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
361 o 7: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
362 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
363 o 6: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
364 | |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19214
diff
changeset
|
365 | @ 5: 'I' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
366 |/ |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
367 o 4: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
368 | |
14122
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
369 | o 3: 'G' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
370 |/| |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
371 o | 2: 'F' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
372 | | |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
373 | o 1: 'E' |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
374 |/ |
e83567686d66
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13856
diff
changeset
|
375 o 0: 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
376 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
377 $ cd .. |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
378 |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
379 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
380 Specify only revs (from 2 onto 8) |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
381 |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
382 $ hg clone -q -u . a2heads a9 |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
383 $ cd a9 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
384 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
385 $ hg rebase --rev 'desc("C")::' |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
386 rebasing 2:5fddd98957c8 "C" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
387 rebasing 3:32af7686d403 "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
388 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
389 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
390 $ hg tglog |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
391 o 6: 'D' |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
392 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
393 o 5: '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:
16913
diff
changeset
|
394 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
395 @ 4: '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:
16913
diff
changeset
|
396 | |
28100
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
397 o 3: 'H' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
398 | |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
399 o 2: 'F' |
ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27963
diff
changeset
|
400 | |
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:
16913
diff
changeset
|
401 | o 1: 'B' |
16550
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
402 |/ |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
403 o 0: 'A' |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
404 |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
405 $ cd .. |
0d494a38c586
test-rebase-parameters: more tests for revset/opts
Patrick Mezard <patrick@mezard.eu>
parents:
16350
diff
changeset
|
406 |
27963
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
407 Rebasing both a single revision and a merge in one command |
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
408 |
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
409 $ hg clone -q -u . a aX |
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
410 $ cd aX |
28101
79437fb352ce
tests: add an explicit destination in some rebase tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28100
diff
changeset
|
411 $ hg rebase -r 3 -r 6 --dest 8 |
27963
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
412 rebasing 3:32af7686d403 "D" |
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
413 rebasing 6:eea13746799a "G" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
414 saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg (glob) |
27963
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
415 $ cd .. |
07a5de79ec30
rebase: better way to detect non-detaching revisions (issue5044)
Martijn Pieters <mj@zopatista.com>
parents:
27626
diff
changeset
|
416 |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
417 Test --tool parameter: |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
418 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
419 $ hg init b |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
420 $ cd b |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
421 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
422 $ echo c1 > c1 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
423 $ hg ci -Am c1 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
424 adding c1 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
425 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
426 $ echo c2 > c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
427 $ hg ci -Am c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
428 adding c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
429 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
430 $ hg up -q 0 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
431 $ echo c2b > c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
432 $ hg ci -Am c2b |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
433 adding c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
434 created new head |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
435 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
436 $ cd .. |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
437 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
438 $ hg clone -q -u . b b1 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
439 $ cd b1 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
440 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
441 $ hg rebase -s 2 -d 1 --tool internal:local |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
442 rebasing 2:e4e3f3546619 "c2b" (tip) |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
443 note: rebase of 2:e4e3f3546619 created no changes to commit |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
444 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
445 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
446 $ hg cat c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
447 c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
448 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
449 $ cd .. |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
450 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
451 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
452 $ hg clone -q -u . b b2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
453 $ cd b2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
454 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
455 $ hg rebase -s 2 -d 1 --tool internal:other |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
456 rebasing 2:e4e3f3546619 "c2b" (tip) |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
457 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
458 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
459 $ hg cat c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
460 c2b |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
461 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
462 $ cd .. |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
463 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
464 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
465 $ hg clone -q -u . b b3 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
466 $ cd b3 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
467 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
468 $ hg rebase -s 2 -d 1 --tool internal:fail |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
469 rebasing 2:e4e3f3546619 "c2b" (tip) |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
17005
diff
changeset
|
470 unresolved conflicts (see hg resolve, then hg rebase --continue) |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18933
diff
changeset
|
471 [1] |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
472 |
19213
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
473 $ hg summary |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
474 parent: 1:56daeba07f4b |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
475 c2 |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
476 parent: 2:e4e3f3546619 tip |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
477 c2b |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
478 branch: default |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
479 commit: 1 modified, 1 unresolved (merge) |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
480 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
481 phases: 3 draft |
19214
0250047a365e
summary: indicate if a rebase is underway
Bryan O'Sullivan <bryano@fb.com>
parents:
19213
diff
changeset
|
482 rebase: 0 rebased, 1 remaining (rebase --continue) |
19213
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18935
diff
changeset
|
483 |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
484 $ hg resolve -l |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
485 U c2 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
486 |
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
487 $ hg resolve -m c2 |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
488 (no more unresolved files) |
27626
157675d0f600
rebase: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents:
26496
diff
changeset
|
489 continue: hg rebase --continue |
28122
6025ddb4e649
rebase: suggest the correct tool to continue (not rebase)
timeless <timeless@mozdev.org>
parents:
28101
diff
changeset
|
490 $ hg graft --continue |
6025ddb4e649
rebase: suggest the correct tool to continue (not rebase)
timeless <timeless@mozdev.org>
parents:
28101
diff
changeset
|
491 abort: no graft in progress |
6025ddb4e649
rebase: suggest the correct tool to continue (not rebase)
timeless <timeless@mozdev.org>
parents:
28101
diff
changeset
|
492 (continue: hg rebase --continue) |
6025ddb4e649
rebase: suggest the correct tool to continue (not rebase)
timeless <timeless@mozdev.org>
parents:
28101
diff
changeset
|
493 [255] |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
494 $ hg rebase -c --tool internal:fail |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
495 rebasing 2:e4e3f3546619 "c2b" (tip) |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
496 note: rebase of 2:e4e3f3546619 created no changes to commit |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
28190
diff
changeset
|
497 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) |
13856
0995eee8ffe4
rebase: add --tool argument for specifying merge tool
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12640
diff
changeset
|
498 |
22382
d5b04ee8ecf7
rebase: add a deprecated -i/--interactive flag
David Soria Parra <davidsp@fb.com>
parents:
21947
diff
changeset
|
499 $ hg rebase -i |
26496
b885ab9ca182
rebase: enable histedit for useful help with it
timeless@mozdev.org
parents:
26495
diff
changeset
|
500 abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") |
22382
d5b04ee8ecf7
rebase: add a deprecated -i/--interactive flag
David Soria Parra <davidsp@fb.com>
parents:
21947
diff
changeset
|
501 [255] |
d5b04ee8ecf7
rebase: add a deprecated -i/--interactive flag
David Soria Parra <davidsp@fb.com>
parents:
21947
diff
changeset
|
502 |
d5b04ee8ecf7
rebase: add a deprecated -i/--interactive flag
David Soria Parra <davidsp@fb.com>
parents:
21947
diff
changeset
|
503 $ hg rebase --interactive |
26496
b885ab9ca182
rebase: enable histedit for useful help with it
timeless@mozdev.org
parents:
26495
diff
changeset
|
504 abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") |
22382
d5b04ee8ecf7
rebase: add a deprecated -i/--interactive flag
David Soria Parra <davidsp@fb.com>
parents:
21947
diff
changeset
|
505 [255] |
d5b04ee8ecf7
rebase: add a deprecated -i/--interactive flag
David Soria Parra <davidsp@fb.com>
parents:
21947
diff
changeset
|
506 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16566
diff
changeset
|
507 $ cd .. |
23246
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
508 |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
509 No common ancestor |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
510 |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
511 $ hg init separaterepo |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
512 $ cd separaterepo |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
513 $ touch a |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
514 $ hg commit -Aqm a |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
515 $ hg up -q null |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
516 $ touch b |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
517 $ hg commit -Aqm b |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
518 $ hg rebase -d 0 |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
519 nothing to rebase from d7486e00c6f1 to 3903775176ed |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
520 [1] |
643c58303fb0
rebase: fix rebase with no common ancestors (issue4446)
Durham Goode <durham@fb.com>
parents:
22382
diff
changeset
|
521 $ cd .. |