Mercurial > hg

diff tests/test-rebase-named-branches.t @ 34006:32528419db64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: sort destmap topologically Previously rebase source and destination could not overlap. But with the multi-destination support, source and destination could reasonably partially overlap. That requires another topological sort on `{sourcerev: destrev}` graph (destmap). This patch implements that. If a revision's destination is itself, the error message gets changed from "source is ancestor of destination" to "source and destination form a cycle". Not marking as BC since automation should depend on exit code, not error message. Differential Revision: https://phab.mercurial-scm.org/D470
author Jun Wu <quark@fb.com>
date Mon, 21 Aug 2017 20:22:07 -0700
parents 3b7cb3d17137
children eb586ed5d8ce
line wrap: on
line diff
--- a/tests/test-rebase-named-branches.t	Tue Aug 29 17:27:37 2017 -0700
+++ b/tests/test-rebase-named-branches.t	Mon Aug 21 20:22:07 2017 -0700
@@ -245,7 +245,7 @@
   @  0: 'A'
   
   $ hg rebase -s 5 -d 6
-  abort: source is ancestor of destination
+  abort: source and destination form a cycle
   [255]
 
   $ hg rebase -s 6 -d 5