equal
deleted
inserted
replaced
556 elif onode is None: |
556 elif onode is None: |
557 raise util.Abort(_("crosses branches (merge branches or update" |
557 raise util.Abort(_("crosses branches (merge branches or update" |
558 " --check to force update)")) |
558 " --check to force update)")) |
559 else: |
559 else: |
560 # Allow jumping branches if clean and specific rev given |
560 # Allow jumping branches if clean and specific rev given |
561 overwrite = True |
561 pa = p1 |
562 |
562 |
563 ### calculate phase |
563 ### calculate phase |
564 action = [] |
564 action = [] |
565 wc.status(unknown=True) # prime cache |
565 wc.status(unknown=True) # prime cache |
566 folding = not util.checkcase(repo.path) |
566 folding = not util.checkcase(repo.path) |