Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-obsolete-divergent.t
changeset 624 ce46d1624d4a
parent 587 8152fedbac65
child 625 e291e5271694
child 630 722b52c75f02 
--- a/tests/test-obsolete-divergent.t	Tue Nov 27 14:28:41 2012 +0100
+++ b/tests/test-obsolete-divergent.t	Sun Dec 02 16:21:19 2012 +0100
@@ -85,10 +85,13 @@
 check that mercurial refuse to push
 
   $ hg init ../other
+  $ hg log -r 'outgoing("../other") and divergent()'
+  2:82623d38b9ba A_1
+  3:392fd25390da A_2
   $ hg push ../other
   pushing to ../other
   searching for changes
-  abort: push includes a divergent changeset: 82623d38b9ba!
+  abort: push includes a divergent changeset: (82623d38b9ba|392fd25390da)! (re)
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
evolve