87bb785c574f — Oben Sonne 9 years ago
Adapt tests to latest bookmark changes
2 files changed, 8 insertions(+), 12 deletions(-)

M tests/test-compass
M tests/test-compass.out
M tests/test-compass +1 -2
@@ 6,14 6,13 @@ 
 
 [ -n "$HGRCPATH" ] && cat >> $HGRCPATH <<EOF
 [extensions]
-hgext.bookmarks=
 hgext.compass=
 EOF
 
 export COLUMNS=80
 
 HGDO="hg -q"
-HGCI="$HGDO ci -d 1970-1-1 -u test"
+HGCI="$HGDO ci -d 1980-1-1 -u test"
 
 rm -rf testrepo
 mkdir testrepo

          
M tests/test-compass.out +7 -10
@@ 1115,7 1115,7 @@ Rev      6 dev-1.1 (feature-1.1a)       
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #
 #-----------------------------------------------------------------------------#

          
@@ 1144,7 1144,7 @@ dev-1.1*                           3 hea
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
            Edit f.dev-1.1 in dev-1.1 (add 2nd head to dev-1.1)                 
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #

          
@@ 1183,7 1183,7 @@ dev-1.1*                           3 hea
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #
 #-----------------------------------------------------------------------------#

          
@@ 1206,7 1206,7 @@ dev-1.1*                           3 hea
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #
 #-----------------------------------------------------------------------------#

          
@@ 1226,7 1226,7 @@ Rev     23 feature-foo                  
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #
 #-----------------------------------------------------------------------------#

          
@@ 1251,7 1251,7 @@ dev-1.1*                           3 hea
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #
 #-----------------------------------------------------------------------------#

          
@@ 4328,7 4328,7 @@ dev-1.1*                           3 hea
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#
-Rev      6 dev-1.1 (feature-1.1a)                                  [age]
+Rev      6 dev-1.1 (feature-1.1a*)                                 [age]
 #-----------------------------------------------------------------------------#
 #                                 Other heads                                 #
 #-----------------------------------------------------------------------------#

          
@@ 4353,9 4353,6 @@ feature-foo (closed)               1 hea
 dev-1.2 (closed)                   1 heads (1 active, 0 inactive, 0 bookmarked)
 dev-1.0                            3 heads (3 active, 0 inactive, 0 bookmarked)
 dev-1.1*                           3 heads (2 active, 1 inactive, 1 bookmarked)
-#-----------------------------------------------------------------------------#
-#          None of your bookmarks (feature-1.1a) will move on commit!         #
-#-----------------------------------------------------------------------------#
 #=============================================================================#
 #                              You are at a head                              #
 #=============================================================================#