Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 16169:c12d4aceba79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: remove checkdirs options This removes the undocumented merge.followdirs option, which has always been true.
author Matt Mackall <mpm@selenic.com>
date Sat, 25 Feb 2012 14:22:58 -0600
parents 3eab42088be4
children c655e4acaa82
comparison
equal deleted inserted replaced
16168:7bbabfe25321 16169:c12d4aceba79
186 if overwrite: 186 if overwrite:
187 pa = p1 187 pa = p1
188 elif pa == p2: # backwards 188 elif pa == p2: # backwards
189 pa = p1.p1() 189 pa = p1.p1()
190 elif pa and repo.ui.configbool("merge", "followcopies", True): 190 elif pa and repo.ui.configbool("merge", "followcopies", True):
191 dirs = repo.ui.configbool("merge", "followdirs", True) 191 copy, diverge = copies.mergecopies(repo, p1, p2, pa)
192 copy, diverge = copies.mergecopies(repo, p1, p2, pa, dirs)
193 for of, fl in diverge.iteritems(): 192 for of, fl in diverge.iteritems():
194 act("divergent renames", "dr", of, fl) 193 act("divergent renames", "dr", of, fl)
195 194
196 repo.ui.note(_("resolving manifests\n")) 195 repo.ui.note(_("resolving manifests\n"))
197 repo.ui.debug(" overwrite: %s, partial: %s\n" 196 repo.ui.debug(" overwrite: %s, partial: %s\n"