Commits

Pierre-Yves David committed ce46d16

more versatile test.

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

Comments (0)

Files changed (1)

tests/test-obsolete-divergent.t

 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]