Mercurial > hg

changeset 23362:cc83cac41619

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 19 Nov 2014 08:50:08 -0800
parents 936b0ff34346
children 55525924af43
files mercurial/merge.py
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: