equal
deleted
inserted
replaced
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-rebase.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-rebase.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-rebase.hg (glob) |
33 |
33 |
34 Requiring dest should not break continue or other rebase options |
34 Requiring dest should not break continue or other rebase options |
35 $ hg up 1 -q |
35 $ hg up 1 -q |
36 $ echo d >> c |
36 $ echo d >> c |
37 $ hg commit -qAm dc |
37 $ hg commit -qAm dc |
54 $ hg resolve --mark --all |
54 $ hg resolve --mark --all |
55 (no more unresolved files) |
55 (no more unresolved files) |
56 continue: hg rebase --continue |
56 continue: hg rebase --continue |
57 $ hg rebase --continue |
57 $ hg rebase --continue |
58 rebasing 3:0537f6b50def "dc" (tip) |
58 rebasing 3:0537f6b50def "dc" (tip) |
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob) |
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg (glob) |
60 |
60 |
61 $ cd .. |
61 $ cd .. |
62 |
62 |
63 Check rebase.requiredest interaction with pull --rebase |
63 Check rebase.requiredest interaction with pull --rebase |
64 $ hg clone repo clone |
64 $ hg clone repo clone |