Show More
@@ -64,9 +64,9 b' def write(repo, refs):' | |||||
64 | ''' |
|
64 | ''' | |
65 | if os.path.exists(repo.join('bookmarks')): |
|
65 | if os.path.exists(repo.join('bookmarks')): | |
66 | util.copyfile(repo.join('bookmarks'), repo.join('undo.bookmarks')) |
|
66 | util.copyfile(repo.join('bookmarks'), repo.join('undo.bookmarks')) | |
67 | file = repo.opener('bookmarks', 'w+') |
|
|||
68 | if current(repo) not in refs: |
|
67 | if current(repo) not in refs: | |
69 | setcurrent(repo, None) |
|
68 | setcurrent(repo, None) | |
|
69 | file = repo.opener('bookmarks', 'w+') | |||
70 | for refspec, node in refs.items(): |
|
70 | for refspec, node in refs.items(): | |
71 | file.write("%s %s\n" % (hex(node), refspec)) |
|
71 | file.write("%s %s\n" % (hex(node), refspec)) | |
72 | file.close() |
|
72 | file.close() | |
@@ -138,6 +138,8 b' def bookmark(ui, repo, mark=None, rev=No' | |||||
138 | raise util.Abort(_("new bookmark name required")) |
|
138 | raise util.Abort(_("new bookmark name required")) | |
139 | marks[mark] = marks[rename] |
|
139 | marks[mark] = marks[rename] | |
140 | del marks[rename] |
|
140 | del marks[rename] | |
|
141 | if current(repo) == rename: | |||
|
142 | setcurrent(repo, mark) | |||
141 | write(repo, marks) |
|
143 | write(repo, marks) | |
142 | return |
|
144 | return | |
143 |
|
145 |
General Comments 0
You need to be logged in to leave comments.
Login now