diff -r 03604f46d48a -r e411fd79ca69 tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t Wed Dec 12 03:20:49 2012 +0100 +++ b/tests/test-obsolete-divergent.t Sat Nov 10 02:19:20 2012 +0100 @@ -84,6 +84,16 @@ $ hg log -r 'divergent()' 2:82623d38b9ba A_1 3:392fd25390da A_2 + +check that mercurial refuse to push + + $ hg init ../other + $ hg push ../other + pushing to ../other + searching for changes + abort: push includes divergent changeset: 82623d38b9ba! + [255] + $ cd ..