Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 6425:2d9328a2f81f
copies: skip directory rename checks when not merging
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 29 Mar 2008 12:39:47 -0500 |
| parents | 0b89315d5de2 |
| children | 368a4ec603cc 1d38f3605b20 |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Mar 29 12:39:47 2008 -0500 +++ b/mercurial/merge.py Sat Mar 29 12:39:47 2008 -0500 @@ -101,7 +101,9 @@ action.append((f, m) + args) if pa and not (backwards or overwrite): - copy, diverge = copies.copies(repo, p1, p2, pa) + if repo.ui.configbool("merge", "followcopies", True): + dirs = repo.ui.configbool("merge", "followdirs", True) + copy, diverge = copies.copies(repo, p1, p2, pa, dirs) copied = dict.fromkeys(copy.values()) for of, fl in diverge.items(): act("divergent renames", "dr", of, fl)