equal
deleted
inserted
replaced
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: |