# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1354461679 -3600
# Node ID ce46d1624d4a62e3d726db88c519a404d1403fba
# Parent  8cbada2b0c437db92854f99f851a8388907eb6de
more versatile test.

push can fails on any divergent changeset I do not care for now.

diff -r 8cbada2b0c43 -r ce46d1624d4a tests/test-obsolete-divergent.t
--- 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]