bookmarks: Fix tests

As we merge tags now with bookmarks we have add those tags
to the tests.

tests/test-bookmarks-rebase.out

@@ -1,42 +1,44
 % initialize repository
 adding a
 adding b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding c
 created new head
 adding d
 % bookmark list
  * two                       3:2ae46b1d99a7
    one                       1:925d80f479bb
 % rebase
 saving bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (-1 heads)
 rebase completed
 changeset:   3:9163974d1cb5
 tag:         tip
+tag:         two
+tag:         one
 parent:      1:925d80f479bb
 parent:      2:db815d6d32e6
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     3
 
 changeset:   2:db815d6d32e6
 parent:      0:f7b1eb17ad24
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     2
 
 changeset:   1:925d80f479bb
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     1
 
 changeset:   0:f7b1eb17ad24
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     0
 

tests/test-bookmarks.out

@@ -1,70 +1,74
 % no bookmarks
 no bookmarks set
 % bookmark rev -1
 % list bookmarks
  * X                         -1:000000000000
 % bookmark X moved to rev 0
  * X                         0:f7b1eb17ad24
 % look up bookmark
 changeset:   0:f7b1eb17ad24
+tag:         X
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     0
 
 % second bookmark for rev 0
 % bookmark rev -1 again
 % list bookmarks
  * X2                        0:f7b1eb17ad24
  * X                         0:f7b1eb17ad24
    Y                         -1:000000000000
 % bookmarks X and X2 moved to rev 1, Y at rev -1
  * X2                        1:925d80f479bb
  * X                         1:925d80f479bb
    Y                         -1:000000000000
 % bookmark rev 0 again
 % bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0
  * X2                        2:0316ce92851d
  * X                         2:0316ce92851d
    Z                         0:f7b1eb17ad24
    Y                         -1:000000000000
 % rename nonexistent bookmark
 abort: a bookmark of this name does not exist
 % rename to existent bookmark
 abort: a bookmark of the same name already exists
 % force rename to existent bookmark
 % list bookmarks
  * X2                        2:0316ce92851d
  * Y                         2:0316ce92851d
    Z                         0:f7b1eb17ad24
 % rename without new name
 abort: new bookmark name required
 % delete without name
 abort: bookmark name required
 % delete nonexistent bookmark
 abort: a bookmark of this name does not exist
 % bookmark name with spaces should be stripped
 % list bookmarks
  * X2                        2:0316ce92851d
  * Y                         2:0316ce92851d
    Z                         0:f7b1eb17ad24
  * x  y                      2:0316ce92851d
 % look up stripped bookmark name
 changeset:   2:0316ce92851d
+tag:         X2
+tag:         Y
 tag:         tip
+tag:         x  y
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     2
 
 % reject bookmark name with newline
 abort: bookmark name cannot contain newlines
 % bookmark with existing name
 abort: a bookmark of the same name already exists
 % force bookmark with existing name
 % list bookmarks
  * X2                        2:0316ce92851d
  * Y                         2:0316ce92851d
  * Z                         2:0316ce92851d
  * x  y                      2:0316ce92851d
 % revision but no bookmark name
 abort: bookmark name required