Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4400:93652499bed3
merge: simplify a check in checkcopies
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 03 May 2007 17:24:43 -0500 |
parents | 3b7e284b8f28 |
children | 84cd52b48f94 |
comparison
equal
deleted
inserted
replaced
4399:3b7e284b8f28 | 4400:93652499bed3 |
---|---|
155 if not ca: # unrelated? | 155 if not ca: # unrelated? |
156 continue | 156 continue |
157 # named changed on only one side? | 157 # named changed on only one side? |
158 if ca.path() == c.path() or ca.path() == c2.path(): | 158 if ca.path() == c.path() or ca.path() == c2.path(): |
159 fullcopy[c.path()] = of # remember for dir rename detection | 159 fullcopy[c.path()] = of # remember for dir rename detection |
160 if c == ca and c2 == ca: # no merge needed, ignore copy | 160 if c == c2: # no merge needed, ignore copy |
161 continue | 161 continue |
162 copy[c.path()] = of | 162 copy[c.path()] = of |
163 | 163 |
164 if not repo.ui.configbool("merge", "followcopies", True): | 164 if not repo.ui.configbool("merge", "followcopies", True): |
165 return {} | 165 return {} |