Patchwork D6276: copies: clarify mutually exclusive cases in _chain() with a s/if/elif/

login
register
mail settings
Submitter phabricator
Date April 29, 2019, 10:52 p.m.
Message ID <2d3ef4d519ed5503349dabb34f1bf731@localhost.localdomain>
Download mbox | patch
Permalink /patch/39899/
State Not Applicable
Headers show

Comments

phabricator - April 29, 2019, 10:52 p.m.
martinvonz updated this revision to Diff 14971.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6276?vs=14950&id=14971

REVISION DETAIL
  https://phab.mercurial-scm.org/D6276

AFFECTED FILES
  mercurial/copies.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -134,7 +134,7 @@ 
             if t[v] != k:
                 # file wasn't renamed back to itself (i.e. case 4, not 3)
                 t[k] = t[v]
-        if v in src:
+        elif v in src:
             # file is a copy of an existing file, i.e. case 6.
             t[k] = v