equal
deleted
inserted
replaced
5959 rev = node |
5959 rev = node |
5960 |
5960 |
5961 # with no argument, we also move the current bookmark, if any |
5961 # with no argument, we also move the current bookmark, if any |
5962 movemarkfrom = None |
5962 movemarkfrom = None |
5963 if rev is None: |
5963 if rev is None: |
5964 movemarkfrom = repo['.'].node() |
5964 curmark = repo._bookmarkcurrent |
|
5965 if bookmarks.iscurrent(repo): |
|
5966 movemarkfrom = repo['.'].node() |
|
5967 elif curmark: |
|
5968 ui.status(_("updating to active bookmark %s\n") % curmark) |
|
5969 rev = curmark |
5965 |
5970 |
5966 # if we defined a bookmark, we have to remember the original bookmark name |
5971 # if we defined a bookmark, we have to remember the original bookmark name |
5967 brev = rev |
5972 brev = rev |
5968 rev = scmutil.revsingle(repo, rev, rev).rev() |
5973 rev = scmutil.revsingle(repo, rev, rev).rev() |
5969 |
5974 |