Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 16095:3eab42088be4
update: just merge unknown file collisions
The unknown file collision rule was introduced as an extension of the
"should be clean when merging" rule. Unfortunately, it got applied to
the normal update path, which should be happy to merge local changes.
This patch gives us merges for unknown file collisions on update,
while preserving abort for merge and update -c.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 09 Feb 2012 17:54:47 -0600 |
| parents | 914bc95e227b |
| children | 8dc573a9c5e5 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Feb 09 17:04:17 2012 -0600 +++ b/mercurial/commands.py Thu Feb 09 17:54:47 2012 -0600 @@ -5723,6 +5723,7 @@ raise util.Abort(_("uncommitted local changes")) if not rev: rev = repo[repo[None].branch()].rev() + mergemod._checkunknown(repo, repo[None], repo[rev]) if clean: ret = hg.clean(repo, rev)