Mercurial > hg-stable

diff tests/test-rebase-parameters.t @ 23246:643c58303fb0 stable 3.2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix rebase with no common ancestors (issue4446) The new rebase revset didn't check for the case when there are no common ancestors. Now it does. The new behavior should be the same as the pre-3.2 behavior. Added a test.
author Durham Goode <durham@fb.com>
date Mon, 10 Nov 2014 10:44:42 -0800
parents d5b04ee8ecf7
children 328afbad6e57
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t	Thu Nov 06 10:57:13 2014 -0500
+++ b/tests/test-rebase-parameters.t	Mon Nov 10 10:44:42 2014 -0800
@@ -468,3 +468,17 @@
   [255]
 
   $ cd ..
+
+No common ancestor
+
+  $ hg init separaterepo
+  $ cd separaterepo
+  $ touch a
+  $ hg commit -Aqm a
+  $ hg up -q null
+  $ touch b
+  $ hg commit -Aqm b
+  $ hg rebase -d 0
+  nothing to rebase from d7486e00c6f1 to 3903775176ed
+  [1]
+  $ cd ..