equal
deleted
inserted
replaced
878 tgt = cur |
878 tgt = cur |
879 if rev: |
879 if rev: |
880 tgt = scmutil.revsingle(repo, rev).node() |
880 tgt = scmutil.revsingle(repo, rev).node() |
881 checkconflict(repo, mark, force, tgt) |
881 checkconflict(repo, mark, force, tgt) |
882 marks[mark] = tgt |
882 marks[mark] = tgt |
883 if not inactive and cur == marks[mark]: |
883 if not inactive and cur == marks[mark] and not rev: |
884 bookmarks.setcurrent(repo, mark) |
884 bookmarks.setcurrent(repo, mark) |
885 elif cur != tgt and mark == repo._bookmarkcurrent: |
885 elif cur != tgt and mark == repo._bookmarkcurrent: |
886 bookmarks.setcurrent(repo, None) |
886 bookmarks.setcurrent(repo, None) |
887 marks.write() |
887 marks.write() |
888 |
888 |