Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 1995:2da2d46862fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Spelling fix: "commited" -> "committed"
author mcmillen@cs.cmu.edu
date Fri, 24 Mar 2006 14:53:23 +0100
parents 719cf07b076d
children 65cc17ae9649
comparison
equal deleted inserted replaced
1994:78ef83c9e9e1 1995:2da2d46862fb
1439 if allow and linear_path: 1439 if allow and linear_path:
1440 raise util.Abort(_("there is nothing to merge, " 1440 raise util.Abort(_("there is nothing to merge, "
1441 "just use 'hg update'")) 1441 "just use 'hg update'"))
1442 if allow and not forcemerge: 1442 if allow and not forcemerge:
1443 if modified or added or removed: 1443 if modified or added or removed:
1444 raise util.Abort(_("outstanding uncommited changes")) 1444 raise util.Abort(_("outstanding uncommitted changes"))
1445 if not forcemerge and not force: 1445 if not forcemerge and not force:
1446 for f in unknown: 1446 for f in unknown:
1447 if f in m2: 1447 if f in m2:
1448 t1 = self.wread(f) 1448 t1 = self.wread(f)
1449 t2 = self.file(f).read(m2[f]) 1449 t2 = self.file(f).read(m2[f])