Show More
@@ -0,0 +1,33 b'' | |||||
|
1 | Require a destination | |||
|
2 | $ cat >> $HGRCPATH <<EOF | |||
|
3 | > [extensions] | |||
|
4 | > rebase = | |||
|
5 | > [commands] | |||
|
6 | > rebase.requiredest = True | |||
|
7 | > EOF | |||
|
8 | $ hg init repo | |||
|
9 | $ cd repo | |||
|
10 | $ echo a >> a | |||
|
11 | $ hg commit -qAm aa | |||
|
12 | $ echo b >> b | |||
|
13 | $ hg commit -qAm bb | |||
|
14 | $ hg up ".^" | |||
|
15 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
16 | $ echo c >> c | |||
|
17 | $ hg commit -qAm cc | |||
|
18 | $ hg rebase | |||
|
19 | abort: you must specify a destination | |||
|
20 | (use: hg rebase -d REV) | |||
|
21 | [255] | |||
|
22 | $ hg rebase -d 1 | |||
|
23 | rebasing 2:5db65b93a12b "cc" (tip) | |||
|
24 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) | |||
|
25 | $ hg rebase -d 0 -r . -q | |||
|
26 | $ HGPLAIN=1 hg rebase | |||
|
27 | rebasing 2:889b0bc6a730 "cc" (tip) | |||
|
28 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) | |||
|
29 | $ hg rebase -d 0 -r . -q | |||
|
30 | $ hg --config commands.rebase.requiredest=False rebase | |||
|
31 | rebasing 2:279de9495438 "cc" (tip) | |||
|
32 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) | |||
|
33 |
@@ -391,33 +391,3 b' Multiple roots. Two children share two p' | |||||
391 | / |
|
391 | / | |
392 | o 0: A |
|
392 | o 0: A | |
393 |
|
393 | |||
394 | Require a destination |
|
|||
395 | $ cat >> $HGRCPATH <<EOF |
|
|||
396 | > [commands] |
|
|||
397 | > rebase.requiredest = True |
|
|||
398 | > EOF |
|
|||
399 | $ hg init repo |
|
|||
400 | $ cd repo |
|
|||
401 | $ echo a >> a |
|
|||
402 | $ hg commit -qAm aa |
|
|||
403 | $ echo b >> b |
|
|||
404 | $ hg commit -qAm bb |
|
|||
405 | $ hg up ".^" |
|
|||
406 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
407 | $ echo c >> c |
|
|||
408 | $ hg commit -qAm cc |
|
|||
409 | $ hg rebase |
|
|||
410 | abort: you must specify a destination |
|
|||
411 | (use: hg rebase -d REV) |
|
|||
412 | [255] |
|
|||
413 | $ hg rebase -d 1 |
|
|||
414 | rebasing 2:5db65b93a12b "cc" (tip) |
|
|||
415 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) |
|
|||
416 | $ hg rebase -d 0 -r . -q |
|
|||
417 | $ HGPLAIN=1 hg rebase |
|
|||
418 | rebasing 2:889b0bc6a730 "cc" (tip) |
|
|||
419 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) |
|
|||
420 | $ hg rebase -d 0 -r . -q |
|
|||
421 | $ hg --config commands.rebase.requiredest=False rebase |
|
|||
422 | rebasing 2:279de9495438 "cc" (tip) |
|
|||
423 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) |
|
General Comments 0
You need to be logged in to leave comments.
Login now