equal
deleted
inserted
replaced
527 pass # all good |
527 pass # all good |
528 elif wc.files() or wc.deleted(): |
528 elif wc.files() or wc.deleted(): |
529 raise util.Abort(_("crosses branches (merge branches or use" |
529 raise util.Abort(_("crosses branches (merge branches or use" |
530 " --clean to discard changes)")) |
530 " --clean to discard changes)")) |
531 elif onode is None: |
531 elif onode is None: |
532 raise util.Abort(_("crosses branches (merge branches or use" |
532 raise util.Abort(_("crosses branches (merge branches or update" |
533 " --check to force update)")) |
533 " --check to force update)")) |
534 else: |
534 else: |
535 # Allow jumping branches if clean and specific rev given |
535 # Allow jumping branches if clean and specific rev given |
536 overwrite = True |
536 overwrite = True |
537 |
537 |