equal
deleted
inserted
replaced
500 "(use 'hg status' to list changes)")) |
500 "(use 'hg status' to list changes)")) |
501 elif not overwrite: |
501 elif not overwrite: |
502 if pa == p1 or pa == p2: # linear |
502 if pa == p1 or pa == p2: # linear |
503 pass # all good |
503 pass # all good |
504 elif wc.files() or wc.deleted(): |
504 elif wc.files() or wc.deleted(): |
505 raise util.Abort(_("crosses branches (use 'hg merge' to merge " |
505 raise util.Abort(_("crosses branches (merge branches or use" |
506 "or use 'hg update -C' to discard changes)")) |
506 " --clean to discard changes)")) |
507 elif onode is None: |
507 elif onode is None: |
508 raise util.Abort(_("crosses branches (use 'hg merge' or use " |
508 raise util.Abort(_("crosses branches (merge branches or use" |
509 "'hg update -c')")) |
509 " --check to force update)")) |
510 else: |
510 else: |
511 # Allow jumping branches if clean and specific rev given |
511 # Allow jumping branches if clean and specific rev given |
512 overwrite = True |
512 overwrite = True |
513 |
513 |
514 ### calculate phase |
514 ### calculate phase |