changeset 624:ce46d1624d4a

more versatile test. push can fails on any divergent changeset I do not care for now.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sun, 02 Dec 2012 16:21:19 +0100
parents 8cbada2b0c43
children e291e5271694 722b52c75f02
files tests/test-obsolete-divergent.t
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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]