diff -r 4bec77e62c00 -r f84e731cbd20 tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t Thu Dec 13 15:38:43 2012 +0100 +++ b/tests/test-obsolete-divergent.t Sat Nov 10 01:56:59 2012 +0100 @@ -75,8 +75,8 @@ d20a80d4def3 d20a80d4def3 007dc284c1f8 + 392fd25390da 82623d38b9ba - 392fd25390da 82623d38b9ba 82623d38b9ba 392fd25390da @@ -139,8 +139,8 @@ d20a80d4def3 d20a80d4def3 007dc284c1f8 + 392fd25390da 82623d38b9ba - 392fd25390da 82623d38b9ba 82623d38b9ba 392fd25390da @@ -396,3 +396,18 @@ $ cd .. + +Subset does not diverge +------------------------------ + +Do not report divergent successors-set if it is a subset of another +successors-set. (report [A,B] not [A] + [A,B]) + + $ newcase subset + $ hg debugobsolete `getid A_0` `getid A_2` + $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` + $ hg debugsuccessorssets 'desc('A_0')' + 007dc284c1f8 + 82623d38b9ba 392fd25390da + + $ cd ..