60 nothing to rebase |
60 nothing to rebase |
61 [1] |
61 [1] |
62 |
62 |
63 $ hg rebase --continue --abort |
63 $ hg rebase --continue --abort |
64 abort: cannot specify both --abort and --continue |
64 abort: cannot specify both --abort and --continue |
65 [255] |
65 [10] |
66 |
66 |
67 $ hg rebase --continue --collapse |
67 $ hg rebase --continue --collapse |
68 abort: cannot use collapse with continue or abort |
68 abort: cannot use collapse with continue or abort |
69 [255] |
69 [255] |
70 |
70 |
71 $ hg rebase --continue --dest 4 |
71 $ hg rebase --continue --dest 4 |
72 abort: cannot specify both --continue and --dest |
72 abort: cannot specify both --continue and --dest |
73 [255] |
73 [10] |
74 |
74 |
75 $ hg rebase --base 5 --source 4 |
75 $ hg rebase --base 5 --source 4 |
76 abort: cannot specify both --source and --base |
76 abort: cannot specify both --source and --base |
77 [255] |
77 [10] |
78 |
78 |
79 $ hg rebase --rev 5 --source 4 |
79 $ hg rebase --rev 5 --source 4 |
80 abort: cannot specify both --rev and --source |
80 abort: cannot specify both --rev and --source |
81 [255] |
81 [10] |
82 $ hg rebase --base 5 --rev 4 |
82 $ hg rebase --base 5 --rev 4 |
83 abort: cannot specify both --rev and --base |
83 abort: cannot specify both --rev and --base |
84 [255] |
84 [10] |
85 |
85 |
86 $ hg rebase --base 6 |
86 $ hg rebase --base 6 |
87 abort: branch 'default' has 3 heads - please rebase to an explicit rev |
87 abort: branch 'default' has 3 heads - please rebase to an explicit rev |
88 (run 'hg heads .' to see heads, specify destination with -d) |
88 (run 'hg heads .' to see heads, specify destination with -d) |
89 [255] |
89 [255] |