merge: remove confusing comment about --force
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 19 Nov 2014 08:50:08 -0800
changeset 23362 cc83cac41619
parent 23361 936b0ff34346
child 23363 55525924af43
merge: remove confusing comment about --force manifestmerge() has a piece of code that's roughly: if not force and different: abort else: # if different: old untracked f may be overwritten and lost ... The comment only talks about what happens when 'different' is true, and in combination with the if-block above, that must mean that it is only about what happens when 'force and different'. It seems quite fine that files are overwritten when 'force' is true, so let's remove the comment. As it stands, it can easily be interpreted as a TODO (which is how I interpreted it at first).
mercurial/merge.py
--- a/mercurial/merge.py	Fri Oct 17 22:23:06 2014 -0700
+++ b/mercurial/merge.py	Wed Nov 19 08:50:08 2014 -0800
@@ -500,7 +500,6 @@
             if not force and different:
                 aborts.append((f, "ud"))
             else:
-                # if different: old untracked f may be overwritten and lost
                 if acceptremote:
                     actions['g'].append((f, (fl2,), "remote recreating"))
                 else: