Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master

1 files changed, 1 insertions, 116 deletions

diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
index 8b8d062..2be06a3 100644
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -84,20 +84,6 @@ bookmarks revset
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
-  $ hg log -r 'bookmark("re:X")'
-  changeset:   0:f7b1eb17ad24
-  bookmark:    X
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     0
-  
-  changeset:   1:925d80f479bb
-  bookmark:    X2
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     1
-  
   $ hg log -r 'bookmark(unknown)'
   abort: bookmark 'unknown' does not exist
   [255]
@@ -253,10 +239,9 @@ the bookmark extension should be ignored now that it is part of core
 test summary
 
   $ hg summary
-  parent: 2:db815d6d32e6 tip
+  parent: 2:db815d6d32e6 tip Y Z x  y
    2
   branch: default
-  bookmarks: *Z Y x  y
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
 
@@ -283,24 +268,18 @@ test rollback
 
 test clone
 
-  $ hg bookmark -r 2 -i @
-  $ hg bookmark -r 2 -i a@
   $ hg bookmarks
-     @                         2:db815d6d32e6
      X2                        1:925d80f479bb
      Y                         2:db815d6d32e6
    * Z                         2:db815d6d32e6
-     a@                        2:db815d6d32e6
      x  y                      2:db815d6d32e6
   $ hg clone . cloned-bookmarks
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R cloned-bookmarks bookmarks
-     @                         2:db815d6d32e6
      X2                        1:925d80f479bb
      Y                         2:db815d6d32e6
      Z                         2:db815d6d32e6
-     a@                        2:db815d6d32e6
      x  y                      2:db815d6d32e6
 
 test clone with pull protocol
@@ -314,16 +293,11 @@ test clone with pull protocol
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R cloned-bookmarks-pull bookmarks
-     @                         2:db815d6d32e6
      X2                        1:925d80f479bb
      Y                         2:db815d6d32e6
      Z                         2:db815d6d32e6
-     a@                        2:db815d6d32e6
      x  y                      2:db815d6d32e6
 
-  $ hg bookmark -d @
-  $ hg bookmark -d a@
-
 test clone with a specific revision
 
   $ hg clone -r 925d80 . cloned-bookmarks-rev
@@ -349,7 +323,6 @@ create bundle with two heads
   $ echo y > tobundle/y
   $ hg -R tobundle branch test
   marked working directory as branch test
-  (branches are permanent and global, did you want a bookmark?)
   $ hg -R tobundle add tobundle/y
   $ hg -R tobundle commit -m'y'
   $ hg -R tobundle bundle tobundle.hg
@@ -369,91 +342,3 @@ create bundle with two heads
    * Z                         3:125c9a1d6df6
      x  y                      2:db815d6d32e6
 
-test wrongly formated bookmark
-
-  $ echo '' >> .hg/bookmarks
-  $ hg bookmarks
-     X2                        1:925d80f479bb
-     Y                         2:db815d6d32e6
-   * Z                         3:125c9a1d6df6
-     x  y                      2:db815d6d32e6
-  $ echo "Ican'thasformatedlines" >> .hg/bookmarks
-  $ hg bookmarks
-  malformed line in .hg/bookmarks: "Ican'thasformatedlines"
-     X2                        1:925d80f479bb
-     Y                         2:db815d6d32e6
-   * Z                         3:125c9a1d6df6
-     x  y                      2:db815d6d32e6
-
-test missing revisions
-
-  $ echo "925d80f479bc z" > .hg/bookmarks
-  $ hg book
-  no bookmarks set
-
-test stripping a non-checked-out but bookmarked revision
-
-  $ hg --config extensions.graphlog= log --graph
-  o  changeset:   4:9ba5f110a0b3
-  |  branch:      test
-  |  tag:         tip
-  |  parent:      2:db815d6d32e6
-  |  user:        test
-  |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     y
-  |
-  | @  changeset:   3:125c9a1d6df6
-  |/   user:        test
-  |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     x
-  |
-  o  changeset:   2:db815d6d32e6
-  |  parent:      0:f7b1eb17ad24
-  |  user:        test
-  |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     2
-  |
-  | o  changeset:   1:925d80f479bb
-  |/   user:        test
-  |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     1
-  |
-  o  changeset:   0:f7b1eb17ad24
-     user:        test
-     date:        Thu Jan 01 00:00:00 1970 +0000
-     summary:     0
-  
-  $ hg book should-end-on-two
-  $ hg co --clean 4
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg book four
-  $ hg --config extensions.mq= strip 3
-  saved backup bundle to * (glob)
-should-end-on-two should end up pointing to revision 2, as that's the
-tipmost surviving ancestor of the stripped revision.
-  $ hg --config extensions.graphlog= log --graph
-  @  changeset:   3:9ba5f110a0b3
-  |  branch:      test
-  |  bookmark:    four
-  |  tag:         tip
-  |  user:        test
-  |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     y
-  |
-  o  changeset:   2:db815d6d32e6
-  |  bookmark:    should-end-on-two
-  |  parent:      0:f7b1eb17ad24
-  |  user:        test
-  |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     2
-  |
-  | o  changeset:   1:925d80f479bb
-  |/   user:        test
-  |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     1
-  |
-  o  changeset:   0:f7b1eb17ad24
-     user:        test
-     date:        Thu Jan 01 00:00:00 1970 +0000
-     summary:     0
-