Mercurial > hg
changeset 27652:cc91f3bc5461
_checkunknownfiles: rename 'aborts' to 'conflicts'
In upcoming patches we'll be able to do more useful things than aborting.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sat, 02 Jan 2016 03:02:57 -0800 |
| parents | 07fc2f2134ba |
| children | 198d291e9ffa |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Jan 02 03:02:57 2016 -0800 +++ b/mercurial/merge.py Sat Jan 02 03:02:57 2016 -0800 @@ -570,19 +570,19 @@ files. For some actions, the result is to abort; for others, it is to choose a different action. """ - aborts = [] + conflicts = [] if not force: for f, (m, args, msg) in actions.iteritems(): if m in ('c', 'dc'): if _checkunknownfile(repo, wctx, mctx, f): - aborts.append(f) + conflicts.append(f) elif m == 'dg': if _checkunknownfile(repo, wctx, mctx, f, args[0]): - aborts.append(f) + conflicts.append(f) - for f in sorted(aborts): + for f in sorted(conflicts): repo.ui.warn(_("%s: untracked file differs\n") % f) - if aborts: + if conflicts: raise error.Abort(_("untracked files in working directory differ " "from files in requested revision"))