Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 6256:69c75d063c7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: require --force when there are deleted files
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 09:56:58 -0300
parents a375ffc2aa1b
children 7e4f66fe964b
comparison
equal deleted inserted replaced
6255:ae83d927c629 6256:69c75d063c7a
607 "'hg update' or look at 'hg heads'")) 607 "'hg update' or look at 'hg heads'"))
608 elif not (overwrite or branchmerge): 608 elif not (overwrite or branchmerge):
609 raise util.Abort(_("update spans branches, use 'hg merge' " 609 raise util.Abort(_("update spans branches, use 'hg merge' "
610 "or 'hg update -C' to lose changes")) 610 "or 'hg update -C' to lose changes"))
611 if branchmerge and not forcemerge: 611 if branchmerge and not forcemerge:
612 if wc.files(): 612 if wc.files() or wc.deleted():
613 raise util.Abort(_("outstanding uncommitted changes")) 613 raise util.Abort(_("outstanding uncommitted changes"))
614 614
615 ### calculate phase 615 ### calculate phase
616 action = [] 616 action = []
617 if not force: 617 if not force: