# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1349768744 -7200
# Node ID 1c523c4008f7bd069c4b8b6a3c6b2aa2252648a4
# Parent  619068c280fd7bfe985c6f03be4f7ee89c9432ff# Parent  605fe310691fbe1579ca8458f9f640d921ce3f1e
merge with crew-stable

diff -r 619068c280fd -r 1c523c4008f7 mercurial/commands.py
--- a/mercurial/commands.py	Mon Oct 08 15:57:21 2012 -0700
+++ b/mercurial/commands.py	Tue Oct 09 09:45:44 2012 +0200
@@ -846,6 +846,12 @@
             raise util.Abort(_("bookmark name required"))
         if len(marks) == 0:
             ui.status(_("no bookmarks set\n"))
+        if inactive:
+            if not repo._bookmarkcurrent:
+                ui.status(_("no active bookmark\n"))
+            else:
+                bookmarks.setcurrent(repo, None)
+            return
         else:
             for bmark, n in sorted(marks.iteritems()):
                 current = repo._bookmarkcurrent
diff -r 619068c280fd -r 1c523c4008f7 tests/test-bookmarks-current.t
--- a/tests/test-bookmarks-current.t	Mon Oct 08 15:57:21 2012 -0700
+++ b/tests/test-bookmarks-current.t	Tue Oct 09 09:45:44 2012 +0200
@@ -115,6 +115,13 @@
      Z                         0:719295282060
 
   $ hg up -q Y
+  $ hg bookmark -i
+  $ hg bookmarks
+     Y                         0:719295282060
+     Z                         0:719295282060
+  $ hg bookmark -i
+  no active bookmark
+  $ hg up -q Y
   $ hg bookmarks
    * Y                         0:719295282060
      Z                         0:719295282060