Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 4633:ff7253a0d1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of whitespace, indentation and line continuation.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Jun 2007 08:06:37 +0200
parents 66ed92ed115a
children 63b9d2deed48
comparison
equal deleted inserted replaced
4632:8d46056960ab 4633:ff7253a0d1da
63 "check for collisions between unknown files and files in mctx" 63 "check for collisions between unknown files and files in mctx"
64 man = mctx.manifest() 64 man = mctx.manifest()
65 for f in wctx.unknown(): 65 for f in wctx.unknown():
66 if f in man: 66 if f in man:
67 if mctx.filectx(f).cmp(wctx.filectx(f).data()): 67 if mctx.filectx(f).cmp(wctx.filectx(f).data()):
68 raise util.Abort(_("untracked local file '%s' differs"\ 68 raise util.Abort(_("untracked local file '%s' differs"
69 " from remote version") % f) 69 " from remote version") % f)
70 70
71 def checkcollision(mctx): 71 def checkcollision(mctx):
72 "check for case folding collisions in the destination context" 72 "check for case folding collisions in the destination context"
73 folded = {} 73 folded = {}