diff hgeditor @ 17895:17c030014ddf stable

subrepo: only do clean update when overwrite is set (issue3276) Files in a subrepo were overwritten on update. But this should only happen on a clean update (example: -C is specified). Use the overwrite parameter introduced for svn subrepos in c19b9282d3a7 to decide whether to merge changes (as update) or remove them (as clean). The new function hg.updaterepo is intruduced to keep all update calls in hg. test-subrepo.t is extended to test if an untracked file is overwritten (issue3276). (Update -C is already tested in many places.) The first two chunks are debugging output which has changed. (Because overwrite is not always true anymore for subrepos) All other tests still pass without any change.
author Simon Heimberg <simohe@besonet.ch>
date Wed, 24 Oct 2012 18:45:22 +0200
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff