[PATCH] merge: report all files in _checkunknown

[Matt Mackall]

On Fri, 2012-01-13 at 13:53 -0500, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh at octave.org>
> # Date 1326315222 18000
> # Node ID 46d716242ad454d7959554aa4cee1f13cacd6d84
> # Parent  c47d69ce5208d5b5cfd2fb2f0f1d7a2b4795fbf5
> merge: report all files in _checkunknown

a) you've gratuitously changed the wording -> you've invited an
avoidable bikeshedding excursion and/or rejection

-            raise util.Abort(_("untracked file in working directory differs"
-                               " from file in requested revision: '%s'") % fn)
+            error = True
+            repo.ui.warn(_("%s: untracked file differs\n") % fn)
+    if error:
+        raise util.Abort(_("untracked files in working directory conflict "
+                           "with files in requested revision"))

Why are we saying "conflicts" when we used to say "differs"? Don't we
have tools for dealing with "conflicts" when updating / merging? Doesn't
this reclassification mean that not using conflict resolution here can
be perceived as a bug and I'm now going to get bug reports? Why do I
want that?

(Never mind making busy work for translators...)

Moral: don't make unrelated changes!!!

b) you didn't update the tests

I'll fix these this time.

-- 
Mathematics is the supreme nostalgia of our time.