view tests/bundles/tampered.hg @ 14663:88cb01c4575e

update: check wc.dirty() before setting overwrite=True merge.update() was missing a few dirtiness checks from workingcontext, including subrepo cleanliness checks. Using wc.dirty() instead of one-off checks for various forms of dirtiness will be significantly safer.
author Augie Fackler <durin42@gmail.com>
date Fri, 17 Jun 2011 15:21:02 -0500
parents cd3032437064
children
line wrap: on
line source

(binary:application/octet-stream)