Mercurial > hg-stable

view tests/test-simplemerge.py.out @ 18987:3605d4e7e618

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: choose a consistent ancestor when there's a tie Previously, we chose a rev based on numeric ordering, which could cause "the same merge" in topologically identical but numerically different repos to choose different merge bases. We now choose the lexically least node; this is stable across different revlog orderings.
author Bryan O'Sullivan <bryano@fb.com>
date Tue, 16 Apr 2013 10:08:19 -0700
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK