Mercurial > hg

view tests/test-simplemerge.py.out @ 23593:b1179dabc6de stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: stop setting None for modified or added nodes Instead use a magic value, so that we can identify modified or added nodes correctly when using manifest.diff(). Thanks to Martin von Zweigbergk for catching that we have to update _buildstatus as well. That part eluded my debugging for some time.
author Augie Fackler <augie@google.com>
date Fri, 12 Dec 2014 15:29:54 -0500
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK