checkunknownfiles: make control flow clearer
In particular, make it clear that we only check for and abort on conflicts if
force is not true.
--- a/mercurial/merge.py Sat Jan 02 03:02:57 2016 -0800
+++ b/mercurial/merge.py Sat Jan 02 03:02:57 2016 -0800
@@ -580,11 +580,11 @@
if _checkunknownfile(repo, wctx, mctx, f, args[0]):
conflicts.append(f)
- for f in sorted(conflicts):
- repo.ui.warn(_("%s: untracked file differs\n") % f)
- if conflicts:
- raise error.Abort(_("untracked files in working directory differ "
- "from files in requested revision"))
+ for f in sorted(conflicts):
+ repo.ui.warn(_("%s: untracked file differs\n") % f)
+ if conflicts:
+ raise error.Abort(_("untracked files in working directory differ "
+ "from files in requested revision"))
for f, (m, args, msg) in actions.iteritems():
if m == 'c':