Mercurial > hg
annotate tests/test-rebase-abort.t @ 42583:b9bc47211cf5
abort: added support for rebase
This adds support of `rebase` to `hg abort` plan.
An independent abort logic for `rebase` is created
under `abortrebase()` function. For this a seperate
`rebaseruntime` object is created under the function to
handle an unfinished `rebasestate` and abort that using
abort logic under `_prepareabortorcontinue`.
Results of tests are shown.
Differential Revision: https://phab.mercurial-scm.org/D6568
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Sun, 23 Jun 2019 23:11:35 +0530 |
parents | 4edd427f34c1 |
children | 35ebdbb38efb |
rev | line source |
---|---|
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
1 #testcases abortcommand abortflag |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
2 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
4 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
5 > rebase= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
6 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
7 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
8 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
9 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
10 > [alias] |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
11 > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
12 > EOF |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
8168
diff
changeset
|
13 |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
14 #if abortflag |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
15 $ cat >> $HGRCPATH <<EOF |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
16 > [alias] |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
17 > abort = rebase --abort |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
18 > EOF |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
19 #endif |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
20 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
21 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
22 $ cd a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
23 |
20327
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
24 $ touch .hg/rebasestate |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
25 $ hg sum |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
26 parent: -1:000000000000 tip (empty repository) |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
27 branch: default |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
28 commit: (clean) |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
29 update: (current) |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
30 abort: .hg/rebasestate is incomplete |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
31 [255] |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
32 $ rm .hg/rebasestate |
46c2331fc750
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
Matt Mackall <mpm@selenic.com>
parents:
20313
diff
changeset
|
33 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
34 $ echo c1 > common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
35 $ hg add common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
36 $ hg ci -m C1 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
37 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
38 $ echo c2 >> common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
39 $ hg ci -m C2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
40 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
41 $ echo c3 >> common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
42 $ hg ci -m C3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
43 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
44 $ hg up -q -C 1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
45 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
46 $ echo l1 >> extra |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
47 $ hg add extra |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
48 $ hg ci -m L1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
49 created new head |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
50 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
51 $ sed -e 's/c2/l2/' common > common.new |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
52 $ mv common.new common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
53 $ hg ci -m L2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
54 |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
55 $ hg phase --force --secret 2 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
56 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
57 $ hg tglog |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
58 @ 4:draft 'L2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
59 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
60 o 3:draft 'L1' |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
61 | |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
62 | o 2:secret 'C3' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
63 |/ |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
64 o 1:draft 'C2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
65 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
66 o 0:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
67 |
11316
7fa3968004c1
rebase: --abort doesn't strip away the target changeset (issue2220)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
11208
diff
changeset
|
68 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
69 Conflicting rebase: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
70 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
71 $ hg rebase -s 3 -d 2 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
72 rebasing 3:3163e20567cc "L1" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
73 rebasing 4:46f0b057b5c0 "L2" (tip) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
74 merging common |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25382
diff
changeset
|
75 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
17477
diff
changeset
|
76 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
|
77 [1] |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
78 |
27027
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
79 Insert unsupported advisory merge record: |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
80 |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
81 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
82 $ hg debugmergestate |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
83 * version 2 records |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
84 local: 3e046f2ecedb793b97ed32108086edd1a162f8bc |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
85 other: 46f0b057b5c061d276b91491c22151f78698abd2 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28015
diff
changeset
|
86 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28015
diff
changeset
|
87 local: dest |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28015
diff
changeset
|
88 other: source |
27027
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
89 unrecognized entry: x advisory record |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
28003
diff
changeset
|
90 file extras: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c) |
27027
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
91 file: common (record type "F", state "u", hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
92 local path: common (flags "") |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
93 ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
94 other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
95 $ hg resolve -l |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
96 U common |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
97 |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
98 Insert unsupported mandatory merge record: |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
99 |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
100 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
101 $ hg debugmergestate |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
102 * version 2 records |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
103 local: 3e046f2ecedb793b97ed32108086edd1a162f8bc |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
104 other: 46f0b057b5c061d276b91491c22151f78698abd2 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28015
diff
changeset
|
105 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28015
diff
changeset
|
106 local: dest |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28015
diff
changeset
|
107 other: source |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
28003
diff
changeset
|
108 file extras: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c) |
27027
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
109 file: common (record type "F", state "u", hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
110 local path: common (flags "") |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
111 ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
112 other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
113 unrecognized entry: X mandatory record |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
114 $ hg resolve -l |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
115 abort: unsupported merge state records: X |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
116 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
117 [255] |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
118 $ hg resolve -ma |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
119 abort: unsupported merge state records: X |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
120 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
121 [255] |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
122 |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
123 Abort (should clear out unsupported merge state): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
124 |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
125 #if abortcommand |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
126 when in dry-run mode |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
127 $ hg abort --dry-run |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
128 rebase in progress, will be aborted |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
129 #endif |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
130 |
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
131 $ hg abort |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34290
diff
changeset
|
132 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
133 rebase aborted |
27027
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
134 $ hg debugmergestate |
a01ecbcfaf84
mergestate: handle additional record types specially
Siddharth Agarwal <sid0@fb.com>
parents:
26677
diff
changeset
|
135 no merge state found |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
136 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
137 $ hg tglog |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
138 @ 4:draft 'L2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
139 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
140 o 3:draft 'L1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
141 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
142 | o 2:secret 'C3' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
143 |/ |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
144 o 1:draft 'C2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
145 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
146 o 0:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
147 |
19848
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
148 Test safety for inconsistent rebase state, which may be created (and |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
149 forgotten) by Mercurial earlier than 2.7. This emulates Mercurial |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
150 earlier than 2.7 by renaming ".hg/rebasestate" temporarily. |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
151 |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
152 $ hg rebase -s 3 -d 2 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
153 rebasing 3:3163e20567cc "L1" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
154 rebasing 4:46f0b057b5c0 "L2" (tip) |
19848
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
155 merging common |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25382
diff
changeset
|
156 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
19848
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
157 unresolved conflicts (see hg resolve, then hg rebase --continue) |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
158 [1] |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
159 |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
160 $ mv .hg/rebasestate .hg/rebasestate.back |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
161 $ hg update --quiet --clean 2 |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
162 $ hg --config extensions.mq= strip --quiet "destination()" |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
163 $ mv .hg/rebasestate.back .hg/rebasestate |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
164 |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
165 $ hg rebase --continue |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
166 abort: cannot continue inconsistent rebase |
20313
dcd65ce87260
hgext: fix one typo in rebase
Simon Heimberg <simohe@besonet.ch>
parents:
20117
diff
changeset
|
167 (use "hg rebase --abort" to clear broken state) |
19848
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
168 [255] |
19849
e7fa36d2ad3a
rebase: catch RepoLookupError at restoring rebase state for summary
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19848
diff
changeset
|
169 $ hg summary | grep '^rebase: ' |
e7fa36d2ad3a
rebase: catch RepoLookupError at restoring rebase state for summary
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19848
diff
changeset
|
170 rebase: (use "hg rebase --abort" to clear broken state) |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
171 $ hg abort |
19848
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
172 rebase aborted (no revision is removed, only broken state is cleared) |
577f4c562d52
rebase: catch RepoLookupError at restoring rebase state for abort/continue
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18935
diff
changeset
|
173 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
174 $ cd .. |
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:
11316
diff
changeset
|
176 |
17477 | 177 Construct new repo: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
178 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
179 $ hg init b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
180 $ cd b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
181 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
182 $ echo a > a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
183 $ hg ci -Am A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
184 adding a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
185 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
186 $ echo b > b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
187 $ hg ci -Am B |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
188 adding b |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
189 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
190 $ echo c > c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
191 $ hg ci -Am C |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
192 adding c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
193 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
194 $ hg up -q 0 |
11316
7fa3968004c1
rebase: --abort doesn't strip away the target changeset (issue2220)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
11208
diff
changeset
|
195 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
196 $ echo b > b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
197 $ hg ci -Am 'B bis' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
198 adding b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
199 created new head |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
200 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
201 $ echo c1 > c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
202 $ hg ci -Am C1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
203 adding c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
204 |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
205 $ hg phase --force --secret 1 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
206 $ hg phase --public 1 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
207 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
208 Rebase and abort without generating new changesets: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
209 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
210 $ hg tglog |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
211 @ 4:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
212 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
213 o 3:draft 'B bis' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
214 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
215 | o 2:secret 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
216 | | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
217 | o 1:public 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
218 |/ |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
219 o 0:public 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
220 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
221 $ hg rebase -b 4 -d 2 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
222 rebasing 3:a6484957d6b9 "B bis" |
40865
4edd427f34c1
rebase: clarify that commits that become empty are skipped
Martin von Zweigbergk <martinvonz@google.com>
parents:
40864
diff
changeset
|
223 note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
224 rebasing 4:145842775fec "C1" (tip) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
225 merging c |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25382
diff
changeset
|
226 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
17477
diff
changeset
|
227 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
|
228 [1] |
11316
7fa3968004c1
rebase: --abort doesn't strip away the target changeset (issue2220)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
11208
diff
changeset
|
229 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
230 $ hg tglog |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
231 @ 4:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
232 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
233 o 3:draft 'B bis' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
234 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
235 | @ 2:secret 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
236 | | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
237 | o 1:public 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
238 |/ |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
239 o 0:public 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
240 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
241 $ hg rebase -a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
242 rebase aborted |
11316
7fa3968004c1
rebase: --abort doesn't strip away the target changeset (issue2220)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
11208
diff
changeset
|
243 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
244 $ hg tglog |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
245 @ 4:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
246 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
247 o 3:draft 'B bis' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
248 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
249 | o 2:secret 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
250 | | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
251 | o 1:public 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
252 |/ |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
253 o 0:public 'A' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11316
diff
changeset
|
254 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15917
diff
changeset
|
255 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15917
diff
changeset
|
256 $ cd .. |
19984
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
257 |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
258 rebase abort should not leave working copy in a merge state if tip-1 is public |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
259 (issue4082) |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
260 |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
261 $ hg init abortpublic |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
262 $ cd abortpublic |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
263 $ echo a > a && hg ci -Aqm a |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
264 $ hg book master |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
265 $ hg book foo |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
266 $ echo b > b && hg ci -Aqm b |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
267 $ hg up -q master |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
268 $ echo c > c && hg ci -Aqm c |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
269 $ hg phase -p -r . |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
270 $ hg up -q foo |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
271 $ echo C > c && hg ci -Aqm C |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
272 $ hg log -G --template "{rev} {desc} {bookmarks}" |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
273 @ 3 C foo |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
274 | |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
275 | o 2 c master |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
276 | | |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
277 o | 1 b |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
278 |/ |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
279 o 0 a |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
280 |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
281 |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
282 $ hg rebase -d master -r foo |
34290
4f969b9e0cf5
rebase: also include other namespaces in changeset description
Martin von Zweigbergk <martinvonz@google.com>
parents:
33121
diff
changeset
|
283 rebasing 3:6c0f977a22d8 "C" (foo tip) |
19984
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
284 merging c |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25382
diff
changeset
|
285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
19984
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
286 unresolved conflicts (see hg resolve, then hg rebase --continue) |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
287 [1] |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
288 $ hg abort |
19984
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
289 rebase aborted |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
290 $ hg log -G --template "{rev} {desc} {bookmarks}" |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
291 @ 3 C foo |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
292 | |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
293 | o 2 c master |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
294 | | |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
295 o | 1 b |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
296 |/ |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
297 o 0 a |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
298 |
7d5e7799a29f
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
Durham Goode <durham@fb.com>
parents:
19849
diff
changeset
|
299 $ cd .. |
25069
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
300 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
301 Make sure we don't clobber changes in the working directory when the |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
302 user has somehow managed to update to a different revision (issue4009) |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
303 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
304 $ hg init noupdate |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
305 $ cd noupdate |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
306 $ hg book @ |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
307 $ echo original > a |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
308 $ hg add a |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
309 $ hg commit -m a |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
310 $ echo x > b |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
311 $ hg add b |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
312 $ hg commit -m b1 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
313 $ hg up 0 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
314 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
315 (leaving bookmark @) |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
316 $ hg book foo |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
317 $ echo y > b |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
318 $ hg add b |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
319 $ hg commit -m b2 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
320 created new head |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
321 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
322 $ hg rebase -d @ -b foo --tool=internal:fail |
34290
4f969b9e0cf5
rebase: also include other namespaces in changeset description
Martin von Zweigbergk <martinvonz@google.com>
parents:
33121
diff
changeset
|
323 rebasing 2:070cf4580bb5 "b2" (foo tip) |
25069
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
324 unresolved conflicts (see hg resolve, then hg rebase --continue) |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
325 [1] |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
326 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
327 $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
328 $ hg up -C 0 # user does other stuff in the repo |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
329 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
330 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
331 $ mv rebasestate .hg/ # user upgrades to 2.7 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
332 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
333 $ echo new > a |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
334 $ hg up 1 # user gets an error saying to run hg rebase --abort |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
335 abort: rebase in progress |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
336 (use 'hg rebase --continue' or 'hg rebase --abort') |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
337 [255] |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
338 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
339 $ cat a |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
340 new |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
341 $ hg abort |
25069
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
342 rebase aborted |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
343 $ cat a |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
344 new |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
345 |
01ad8daae5be
test-rebase-abort: add test from issue4009
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23835
diff
changeset
|
346 $ cd .. |
25070
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
347 |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
348 test aborting an interrupted series (issue5084) |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
349 $ hg init interrupted |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
350 $ cd interrupted |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
351 $ touch base |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
352 $ hg add base |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
353 $ hg commit -m base |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
354 $ touch a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
355 $ hg add a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
356 $ hg commit -m a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
357 $ echo 1 > a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
358 $ hg commit -m 1 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
359 $ touch b |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
360 $ hg add b |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
361 $ hg commit -m b |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
362 $ echo 2 >> a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
363 $ hg commit -m c |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
364 $ touch d |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
365 $ hg add d |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
366 $ hg commit -m d |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
367 $ hg co -q 1 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
368 $ hg rm a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
369 $ hg commit -m no-a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
370 created new head |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
371 $ hg co 0 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
373 $ hg log -G --template "{rev} {desc} {bookmarks}" |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
374 o 6 no-a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
375 | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
376 | o 5 d |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
377 | | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
378 | o 4 c |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
379 | | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
380 | o 3 b |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
381 | | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
382 | o 2 1 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
383 |/ |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
384 o 1 a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
385 | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
386 @ 0 base |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
387 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
388 $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
389 rebasing 3:3a71550954f1 "b" |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
390 rebasing 4:e80b69427d80 "c" |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
391 abort: ^C |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
392 [255] |
38181
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
393 |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
394 New operations are blocked with the correct state message |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
395 |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
396 $ find .hg -name '*state' -prune | sort |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
397 .hg/dirstate |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
398 .hg/merge/state |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
399 .hg/rebasestate |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
400 .hg/undo.backup.dirstate |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
401 .hg/undo.dirstate |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
402 .hg/updatestate |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
403 |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
404 $ hg rebase -s 3 -d tip |
38182
79c54e7c0c52
rebase: prioritize indicating an interrupted rebase over update (issue5838)
Matt Harbison <matt_harbison@yahoo.com>
parents:
38181
diff
changeset
|
405 abort: rebase in progress |
79c54e7c0c52
rebase: prioritize indicating an interrupted rebase over update (issue5838)
Matt Harbison <matt_harbison@yahoo.com>
parents:
38181
diff
changeset
|
406 (use 'hg rebase --continue' or 'hg rebase --abort') |
38181
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
407 [255] |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
408 $ hg up . |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
409 abort: rebase in progress |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
410 (use 'hg rebase --continue' or 'hg rebase --abort') |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
411 [255] |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
412 $ hg up -C . |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
413 abort: rebase in progress |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
414 (use 'hg rebase --continue' or 'hg rebase --abort') |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
415 [255] |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
416 |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
417 $ hg graft 3 |
38182
79c54e7c0c52
rebase: prioritize indicating an interrupted rebase over update (issue5838)
Matt Harbison <matt_harbison@yahoo.com>
parents:
38181
diff
changeset
|
418 abort: rebase in progress |
79c54e7c0c52
rebase: prioritize indicating an interrupted rebase over update (issue5838)
Matt Harbison <matt_harbison@yahoo.com>
parents:
38181
diff
changeset
|
419 (use 'hg rebase --continue' or 'hg rebase --abort') |
38181
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
420 [255] |
712d6f535fc9
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison <matt_harbison@yahoo.com>
parents:
35393
diff
changeset
|
421 |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
422 $ hg abort |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34290
diff
changeset
|
423 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
424 rebase aborted |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
425 $ hg log -G --template "{rev} {desc} {bookmarks}" |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
426 o 6 no-a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
427 | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
428 | o 5 d |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
429 | | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
430 | o 4 c |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
431 | | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
432 | o 3 b |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
433 | | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
434 | o 2 1 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
435 |/ |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
436 o 1 a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
437 | |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
438 @ 0 base |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
439 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
440 $ hg summary |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
441 parent: 0:df4f53cec30a |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
442 base |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
443 branch: default |
33121
a5abaa81fad6
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31226
diff
changeset
|
444 commit: (clean) |
27988
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
445 update: 6 new changesets (update) |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
446 phases: 7 draft |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
447 |
61f4d59e9a0b
rebase: update working directory when aborting (issue5084)
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
448 $ cd .. |
25070
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
449 On the other hand, make sure we *do* clobber changes whenever we |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
450 haven't somehow managed to update the repo to a different revision |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
451 during a rebase (issue4661) |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
452 |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
453 $ hg ini yesupdate |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
454 $ cd yesupdate |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
455 $ echo "initial data" > foo.txt |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
456 $ hg add |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
457 adding foo.txt |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
458 $ hg ci -m "initial checkin" |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
459 $ echo "change 1" > foo.txt |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
460 $ hg ci -m "change 1" |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
461 $ hg up 0 |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
462 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
463 $ echo "conflicting change 1" > foo.txt |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
464 $ hg ci -m "conflicting 1" |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
465 created new head |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
466 $ echo "conflicting change 2" > foo.txt |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
467 $ hg ci -m "conflicting 2" |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
468 |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
469 $ hg rebase -d 1 --tool 'internal:fail' |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
470 rebasing 2:e4ea5cdc9789 "conflicting 1" |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
471 unresolved conflicts (see hg resolve, then hg rebase --continue) |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
472 [1] |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
473 $ hg abort |
25070
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
474 rebase aborted |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
475 $ hg summary |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
476 parent: 3:b16646383533 tip |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
477 conflicting 2 |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
478 branch: default |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
479 commit: (clean) |
bd98d073a34f
rebase: clear merge when aborting before any rebasing (issue4661)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25069
diff
changeset
|
480 update: 1 new changesets, 2 branch heads (merge) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
481 phases: 4 draft |
28003
a1d4ca0c8483
tests: fix rebase-abort directory nesting
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
482 $ cd .. |
26677
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
483 |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
484 test aborting a rebase succeeds after rebasing with skipped commits onto a |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
485 public changeset (issue4896) |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
486 |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
487 $ hg init succeedonpublic |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
488 $ cd succeedonpublic |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
489 $ echo 'content' > root |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
490 $ hg commit -A -m 'root' -q |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
491 |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
492 set up public branch |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
493 $ echo 'content' > disappear |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
494 $ hg commit -A -m 'disappear public' -q |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
495 commit will cause merge conflict on rebase |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
496 $ echo '' > root |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
497 $ hg commit -m 'remove content public' -q |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
498 $ hg phase --public |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
499 |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
500 setup the draft branch that will be rebased onto public commit |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
501 $ hg up -r 0 -q |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
502 $ echo 'content' > disappear |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
503 commit will disappear |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
504 $ hg commit -A -m 'disappear draft' -q |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
505 $ echo 'addedcontADDEDentadded' > root |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
506 commit will cause merge conflict on rebase |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
507 $ hg commit -m 'add content draft' -q |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
508 |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
509 $ hg rebase -d 'public()' --tool :merge -q |
40865
4edd427f34c1
rebase: clarify that commits that become empty are skipped
Martin von Zweigbergk <martinvonz@google.com>
parents:
40864
diff
changeset
|
510 note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes |
26677
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
511 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
512 unresolved conflicts (see hg resolve, then hg rebase --continue) |
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
513 [1] |
42583
b9bc47211cf5
abort: added support for rebase
Taapas Agrawal <taapas2897@gmail.com>
parents:
40865
diff
changeset
|
514 $ hg abort |
26677
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
515 rebase aborted |
28003
a1d4ca0c8483
tests: fix rebase-abort directory nesting
timeless <timeless@mozdev.org>
parents:
27027
diff
changeset
|
516 $ cd .. |
26677
e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
Christian Delahousse <cdelahousse@fb.com>
parents:
26614
diff
changeset
|
517 |