view tests/README @ 26078:5ca587348875

convert: fix syncing deletes from p2 merge commit Recently we fixed converting merges to correctly sync changes from p2. We missed the case of deletes though (so p2 deleted a file that p1 had not yet deleted, and the file does not belong to the source). The fix is to detect when p2 doesn't have the file, so we just sync it as a delete to p1 in the merge. Updated the test, and verified it failed before the fix.
author Durham Goode <durham@fb.com>
date Tue, 25 Aug 2015 15:54:33 -0700
parents 1de6e7e1bb9f
children 4b0fc75f9403
line wrap: on
line source

To run the tests, do:

cd tests/
python run-tests.py

See http://mercurial.selenic.com/wiki/WritingTests for
more information on writing tests.