Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 28020:cffa46cbdb8f
merge: tell _checkunknownfiles about whether this was merge --force
In an upcoming patch we'll have different behavior here for when 'merge
--force' is used as opposed to when other kinds of force operations are
performed, like rebases.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 01 Feb 2016 20:28:32 -0800 |
| parents | b502138f5faa |
| children | 91a827e760df |
line wrap: on
line diff
--- a/mercurial/hg.py Mon Feb 01 20:28:32 2016 -0800 +++ b/mercurial/hg.py Mon Feb 01 20:28:32 2016 -0800 @@ -671,10 +671,10 @@ _showstats(repo, stats, quietempty) return stats[3] > 0 -def merge(repo, node, force=None, remind=True): +def merge(repo, node, force=None, remind=True, mergeforce=False): """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" - stats = mergemod.update(repo, node, True, force) + stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce) _showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "