Mercurial > hg

comparison mercurial/merge.py @ 15774:0bd17a4bed88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: split the copies api for "normal" and merge cases (API)
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Jan 2012 15:48:02 -0600
parents 7b7f03502b5a
children 44fa047cef57
comparison
equal deleted inserted replaced
15773:371cff9610cd 15774:0bd17a4bed88
181 pa = p1 181 pa = p1
182 elif pa == p2: # backwards 182 elif pa == p2: # backwards
183 pa = p1.p1() 183 pa = p1.p1()
184 elif pa and repo.ui.configbool("merge", "followcopies", True): 184 elif pa and repo.ui.configbool("merge", "followcopies", True):
185 dirs = repo.ui.configbool("merge", "followdirs", True) 185 dirs = repo.ui.configbool("merge", "followdirs", True)
186 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) 186 copy, diverge = copies.mergecopies(repo, p1, p2, pa, dirs)
187 for of, fl in diverge.iteritems(): 187 for of, fl in diverge.iteritems():
188 act("divergent renames", "dr", of, fl) 188 act("divergent renames", "dr", of, fl)
189 189
190 repo.ui.note(_("resolving manifests\n")) 190 repo.ui.note(_("resolving manifests\n"))
191 repo.ui.debug(" overwrite: %s, partial: %s\n" 191 repo.ui.debug(" overwrite: %s, partial: %s\n"