--- a/tests/test-bookmarks-merge.t	Fri Aug 24 17:51:47 2012 -0500
+++ b/tests/test-bookmarks-merge.t	Mon Aug 27 21:10:11 2012 +0200
@@ -91,3 +91,38 @@
      b                         1:d2ae7f538514
      c                         3:b8f96cf4688b
    * e                         7:ca784329f0ba
+
+# test warning when all heads are inactive bookmarks
+
+  $ hg up -C 6
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo g > g
+  $ hg commit -Am 'g'
+  adding g
+  $ hg bookmark -i g
+  $ hg bookmarks
+     b                         1:d2ae7f538514
+     c                         3:b8f96cf4688b
+     e                         7:ca784329f0ba
+     g                         8:04dd21731d95
+  $ hg heads
+  changeset:   8:04dd21731d95
+  bookmark:    g
+  tag:         tip
+  parent:      6:be381d1126a0
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     g
+  
+  changeset:   7:ca784329f0ba
+  bookmark:    e
+  parent:      5:26bee9c5bcf3
+  parent:      4:a0546fcfe0fb
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merge
+  
+  $ hg merge
+  abort: heads are bookmarked - please merge with an explicit rev
+  (run 'hg heads' to see all heads)
+  [255]