# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1349162802 -7200
# Node ID 4a07d2ff7c66891335db1c17674fb3aeb1e1afa1
# Parent  6647ac9b9044023b4947e890b07d6dfef30ea9b3
clone: activate bookmark specified with --updaterev

diff -r 6647ac9b9044 -r 4a07d2ff7c66 mercurial/hg.py
--- a/mercurial/hg.py	Mon Oct 01 23:11:28 2012 -0500
+++ b/mercurial/hg.py	Tue Oct 02 09:26:42 2012 +0200
@@ -410,6 +410,8 @@
                 bn = destrepo[uprev].branch()
                 destrepo.ui.status(_("updating to branch %s\n") % bn)
                 _update(destrepo, uprev)
+                if update in destrepo._bookmarks:
+                    bookmarks.setcurrent(destrepo, update)
 
         return srcpeer, destpeer
     finally:
diff -r 6647ac9b9044 -r 4a07d2ff7c66 tests/test-bookmarks.t
--- a/tests/test-bookmarks.t	Mon Oct 01 23:11:28 2012 -0500
+++ b/tests/test-bookmarks.t	Tue Oct 02 09:26:42 2012 +0200
@@ -336,6 +336,17 @@
   $ hg -R cloned-bookmarks-rev bookmarks
      X2                        1:925d80f479bb
 
+test clone with update to a bookmark
+
+  $ hg clone -u Z . cloned-bookmarks-update
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg -R cloned-bookmarks-update bookmarks
+     X2                        1:925d80f479bb
+     Y                         2:db815d6d32e6
+   * Z                         2:db815d6d32e6
+     x  y                      2:db815d6d32e6
+
 create bundle with two heads
 
   $ hg clone . tobundle