--- a/hgext/reviewboard/tests/test-commitid.t
+++ b/hgext/reviewboard/tests/test-commitid.t
@@ -28,18 +28,17 @@ Commit ID should be present after review
   $ hg commit -m 'commit 1'
 
   $ hg log -T '{rev}:{node|short} {desc}\n'
   1:306d1563179b commit 1
   
   MozReview-Commit-ID: 124Bxg
   0:96ee1d7354c4 initial
 
-Mercurial doesn't preserve extras on rebase by default. Verify our
-monkeypatch works.
+Verify commit IDs survive rebasing
 
   $ hg -q up -r 0
   $ touch bar
   $ hg -q commit -A -m 'head 2'
 
   $ hg rebase -s 1 -d 2
   rebasing 1:306d1563179b "commit 1"
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/*-backup.hg (glob)
@@ -112,8 +111,31 @@ Graft will preserve commit id.
   grafting 4:84bc2f59c8ec "histedit3"
 
   $ hg log -G -T '{rev}:{node|short} {desc}\n' -r '::.'
   @  6:7eb940c47356 histedit3
   |
   |  MozReview-Commit-ID: JmjAjw
   o  0:96ee1d7354c4 initial
   
+"topic: foo" commit messages result in empty line
+
+  $ hg -q up -r 0
+  $ echo empty > foo
+  $ hg -q commit -m 'foo: empty'
+
+"key: value *" on a line doesn't get interpretted as metadata
+
+  $ echo metadata > foo
+  $ hg commit -l - << EOF
+  > topic: foo
+  > 
+  > foo: bar baz
+  > EOF
+  $ hg log -G -T '{rev}:{node|short} {desc}\n' -r '::.'
+  @  8:ad9558f7cd71 topic: foo
+  |
+  |  foo: bar baz
+  |  MozReview-Commit-ID: TA3f84
+  o  7:12881bf6ca0a foo: empty
+  |  MozReview-Commit-ID: OTOPw0
+  o  0:96ee1d7354c4 initial
+