equal
deleted
inserted
replaced
54 |
54 |
55 def _destupdatebook(repo, clean): |
55 def _destupdatebook(repo, clean): |
56 """decide on an update destination from active bookmark""" |
56 """decide on an update destination from active bookmark""" |
57 # we also move the active bookmark, if any |
57 # we also move the active bookmark, if any |
58 node = None |
58 node = None |
59 activemark, movemark = bookmarks.calculateupdate(repo.ui, repo, None) |
59 activemark, movemark = bookmarks.calculateupdate(repo.ui, repo) |
60 if activemark is not None: |
60 if activemark is not None: |
61 node = repo.lookup(activemark) |
61 node = repo.lookup(activemark) |
62 return node, movemark, activemark |
62 return node, movemark, activemark |
63 |
63 |
64 def _destupdatebranch(repo, clean): |
64 def _destupdatebranch(repo, clean): |