Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 28019:e81d11794036 | 28020:cffa46cbdb8f |
|---|---|
| 669 util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | 669 util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
| 670 if show_stats: | 670 if show_stats: |
| 671 _showstats(repo, stats, quietempty) | 671 _showstats(repo, stats, quietempty) |
| 672 return stats[3] > 0 | 672 return stats[3] > 0 |
| 673 | 673 |
| 674 def merge(repo, node, force=None, remind=True): | 674 def merge(repo, node, force=None, remind=True, mergeforce=False): |
| 675 """Branch merge with node, resolving changes. Return true if any | 675 """Branch merge with node, resolving changes. Return true if any |
| 676 unresolved conflicts.""" | 676 unresolved conflicts.""" |
| 677 stats = mergemod.update(repo, node, True, force) | 677 stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce) |
| 678 _showstats(repo, stats) | 678 _showstats(repo, stats) |
| 679 if stats[3]: | 679 if stats[3]: |
| 680 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " | 680 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
| 681 "or 'hg update -C .' to abandon\n")) | 681 "or 'hg update -C .' to abandon\n")) |
| 682 elif remind: | 682 elif remind: |