Show More
@@ -5719,7 +5719,8 b' def update(ui, repo, node=None, rev=None' | |||||
5719 | ret = hg.update(repo, rev) |
|
5719 | ret = hg.update(repo, rev) | |
5720 |
|
5720 | |||
5721 | if not ret and movemarkfrom: |
|
5721 | if not ret and movemarkfrom: | |
5722 | bookmarks.update(repo, [movemarkfrom], repo['.'].node()) |
|
5722 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
|
5723 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |||
5723 | elif brev in repo._bookmarks: |
|
5724 | elif brev in repo._bookmarks: | |
5724 | bookmarks.setcurrent(repo, brev) |
|
5725 | bookmarks.setcurrent(repo, brev) | |
5725 |
|
5726 |
@@ -101,6 +101,7 b' divergent bookmarks' | |||||
101 | $ cd ../b |
|
101 | $ cd ../b | |
102 | $ hg up |
|
102 | $ hg up | |
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
104 | updating bookmark foobar | |||
104 | $ echo c2 > f2 |
|
105 | $ echo c2 > f2 | |
105 | $ hg ci -Am2 |
|
106 | $ hg ci -Am2 | |
106 | adding f2 |
|
107 | adding f2 |
General Comments 0
You need to be logged in to leave comments.
Login now