Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 12401:4cdaf1adafc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout most of 4f8067c94729
author Matt Mackall <mpm@selenic.com>
date Fri, 24 Sep 2010 12:46:54 -0500
parents 4f8067c94729
children 545ec1775021
comparison
equal deleted inserted replaced
12400:40852b4b910c 12401:4cdaf1adafc8
494 " or check 'hg heads')")) 494 " or check 'hg heads')"))
495 if not force and (wc.files() or wc.deleted()): 495 if not force and (wc.files() or wc.deleted()):
496 raise util.Abort(_("outstanding uncommitted changes " 496 raise util.Abort(_("outstanding uncommitted changes "
497 "(use 'hg status' to list changes)")) 497 "(use 'hg status' to list changes)"))
498 elif not overwrite: 498 elif not overwrite:
499 if pa in (p1, p2): # linear 499 if pa == p1 or pa == p2: # linear
500 pass # all good 500 pass # all good
501 elif wc.files() or wc.deleted(): 501 elif wc.files() or wc.deleted():
502 raise util.Abort(_("crosses branches (use 'hg merge' to merge " 502 raise util.Abort(_("crosses branches (use 'hg merge' to merge "
503 "or use 'hg update -C' to discard changes)")) 503 "or use 'hg update -C' to discard changes)"))
504 elif onode is None: 504 elif onode is None: