Mercurial > hg
comparison mercurial/copies.py @ 12683:ada47c38f4e5
copies: don't detect copies as "divergent renames"
(For the purposes of this patch copy is defined as a rename where the
source continues to exist.)
author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
---|---|
date | Sun, 10 Oct 2010 09:48:37 -0500 |
parents | 4f11978ae45d |
children | a8d13ee0ce68 |
comparison
equal
deleted
inserted
replaced
12682:58a3e2608ae4 | 12683:ada47c38f4e5 |
---|---|
193 for f in u2: | 193 for f in u2: |
194 checkcopies(f, m2, m1) | 194 checkcopies(f, m2, m1) |
195 | 195 |
196 diverge2 = set() | 196 diverge2 = set() |
197 for of, fl in diverge.items(): | 197 for of, fl in diverge.items(): |
198 if len(fl) == 1: | 198 if len(fl) == 1 or of in c2: |
199 del diverge[of] # not actually divergent | 199 del diverge[of] # not actually divergent, or not a rename |
200 else: | 200 else: |
201 diverge2.update(fl) # reverse map for below | 201 diverge2.update(fl) # reverse map for below |
202 | 202 |
203 if fullcopy: | 203 if fullcopy: |
204 repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n") | 204 repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n") |