##// END OF EJS Templates
rebase: test to show brokenness with requiredest...
Ryan McElroy -
r31730:6931c334 default
parent child Browse files
Show More
@@ -31,3 +31,30 b' Require a destination'
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