[PATCH 0 of 8 RFC] Add guard option to update, which aborts if the update is unsafe

Dennis Brakhane brakhane at googlemail.com
Tue Dec 27 05:05:29 CST 2011


On Thu, Dec 22, 2011 at 1:24 AM, Laurens Holst <laurens.nospam at grauw.nl> wrote:
> The driving factor here is really that because you have unversioned changes
> in your local working copy, Mercurial should tread extra carefully. The
> default behaviour of update is I think too destructive in some situations,
> and I would like to have access to a safer version.

Just to be sure: are you aware that hg stores a copy of the original
files before
merging, and you can always get them back and re-merge using "hg
resolve -u" followed
by "hg resolve"?


More information about the Mercurial-devel mailing list