Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 2916:834e147842d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trivial bool() cleanup
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:12:36 -0500
parents f28f4c850cd8
children dd032b0f02ac
comparison
equal deleted inserted replaced
2915:21631c2c09a5 2916:834e147842d7
101 101
102 # resolve the manifest to determine which files 102 # resolve the manifest to determine which files
103 # we care about merging 103 # we care about merging
104 repo.ui.note(_("resolving manifests\n")) 104 repo.ui.note(_("resolving manifests\n"))
105 repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % 105 repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") %
106 (overwrite, branchmerge, partial and True or False, linear_path)) 106 (overwrite, branchmerge, bool(partial), linear_path))
107 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % 107 repo.ui.debug(_(" ancestor %s local %s remote %s\n") %
108 (short(man), short(m1n), short(m2n))) 108 (short(man), short(m1n), short(m2n)))
109 109
110 merge = {} 110 merge = {}
111 get = {} 111 get = {}