comparison tests/test-merge-revert2.out @ 5279:2dbd750b3ddd

convert: clear the dirstate before a conversion, invalidate it afterwards Clearing it before the conversion protects us from whatever data were there (file copies in particular). Invalidating it after the conversion avoids writing a possibly inconsistent dirstate to disk.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 01 Sep 2007 02:49:18 -0300
parents 93a4e72b4f83
children 3d1f9dcecdea
comparison
equal deleted inserted replaced
5278:70e9a527cc61 5279:2dbd750b3ddd