tests/test-simplemerge.py.out
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 31 Dec 2012 17:44:18 -0600
changeset 18163 c5bd753c5bc6
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
amend: allow amend of non-head when obsolete is enabled Obsolescence marker can represent this situation just fine. The old version is marked as precursor of the new changeset. All its descendants become "unstable". If obsolescence is not enabled we keep the current behavior of aborting. This new behavior only applies when obsolete is enabled and is subject to future discussion and changes.

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK