Submitter | Pierre-Yves David |
---|---|
Date | Feb. 20, 2016, 2:30 p.m. |
Message ID | <9ade84f34fbe5ff91be0.1455978652@marginatus.alto.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/13272/ |
State | Accepted |
Delegated to: | Yuya Nishihara |
Headers | show |
Comments
Patch
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -80,10 +80,15 @@ These fail: [255] $ hg rebase --base 5 --rev 4 abort: cannot specify both a revision and a base [255] + $ hg rebase --base 6 + abort: branch 'default' has 3 heads - please rebase to an explicit rev + (run 'hg heads .' to see heads) + [255] + $ hg rebase --rev '1 & !1' --dest 8 empty "rev" revision set - nothing to rebase [1] $ hg rebase --source '1 & !1' --dest 8