Show More
@@ -1,33 +1,60 b'' | |||||
1 | Require a destination |
|
1 | Require a destination | |
2 | $ cat >> $HGRCPATH <<EOF |
|
2 | $ cat >> $HGRCPATH <<EOF | |
3 | > [extensions] |
|
3 | > [extensions] | |
4 | > rebase = |
|
4 | > rebase = | |
5 | > [commands] |
|
5 | > [commands] | |
6 | > rebase.requiredest = True |
|
6 | > rebase.requiredest = True | |
7 | > EOF |
|
7 | > EOF | |
8 | $ hg init repo |
|
8 | $ hg init repo | |
9 | $ cd repo |
|
9 | $ cd repo | |
10 | $ echo a >> a |
|
10 | $ echo a >> a | |
11 | $ hg commit -qAm aa |
|
11 | $ hg commit -qAm aa | |
12 | $ echo b >> b |
|
12 | $ echo b >> b | |
13 | $ hg commit -qAm bb |
|
13 | $ hg commit -qAm bb | |
14 | $ hg up ".^" |
|
14 | $ hg up ".^" | |
15 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
15 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
16 | $ echo c >> c |
|
16 | $ echo c >> c | |
17 | $ hg commit -qAm cc |
|
17 | $ hg commit -qAm cc | |
18 | $ hg rebase |
|
18 | $ hg rebase | |
19 | abort: you must specify a destination |
|
19 | abort: you must specify a destination | |
20 | (use: hg rebase -d REV) |
|
20 | (use: hg rebase -d REV) | |
21 | [255] |
|
21 | [255] | |
22 | $ hg rebase -d 1 |
|
22 | $ hg rebase -d 1 | |
23 | rebasing 2:5db65b93a12b "cc" (tip) |
|
23 | rebasing 2:5db65b93a12b "cc" (tip) | |
24 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) |
|
24 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) | |
25 | $ hg rebase -d 0 -r . -q |
|
25 | $ hg rebase -d 0 -r . -q | |
26 | $ HGPLAIN=1 hg rebase |
|
26 | $ HGPLAIN=1 hg rebase | |
27 | rebasing 2:889b0bc6a730 "cc" (tip) |
|
27 | rebasing 2:889b0bc6a730 "cc" (tip) | |
28 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) |
|
28 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) | |
29 | $ hg rebase -d 0 -r . -q |
|
29 | $ hg rebase -d 0 -r . -q | |
30 | $ hg --config commands.rebase.requiredest=False rebase |
|
30 | $ hg --config commands.rebase.requiredest=False rebase | |
31 | rebasing 2:279de9495438 "cc" (tip) |
|
31 | rebasing 2:279de9495438 "cc" (tip) | |
32 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) |
|
32 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) | |
33 |
|
33 | |||
|
34 | Requiring dest should not break continue or other rebase options | |||
|
35 | $ hg up 1 -q | |||
|
36 | $ echo d >> c | |||
|
37 | $ hg commit -qAm dc | |||
|
38 | $ hg log -G -T '{rev} {desc}' | |||
|
39 | @ 3 dc | |||
|
40 | | | |||
|
41 | | o 2 cc | |||
|
42 | |/ | |||
|
43 | o 1 bb | |||
|
44 | | | |||
|
45 | o 0 aa | |||
|
46 | ||||
|
47 | $ hg rebase -d 2 | |||
|
48 | rebasing 3:0537f6b50def "dc" (tip) | |||
|
49 | merging c | |||
|
50 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | |||
|
51 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |||
|
52 | [1] | |||
|
53 | $ echo d > c | |||
|
54 | $ hg resolve --mark --all | |||
|
55 | (no more unresolved files) | |||
|
56 | continue: hg rebase --continue | |||
|
57 | $ hg rebase --continue | |||
|
58 | abort: you must specify a destination | |||
|
59 | (use: hg rebase -d REV) | |||
|
60 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now