# HG changeset patch # User Oben Sonne # Date 1268780520 -3600 # Wed Mar 17 00:02:00 2010 +0100 # Node ID ae055293ec3851c91605d20b99541777deeb28ef # Parent 04c6ccce0ce28ef946095b3d300e147c87f141cd Fix a missing age equalizer in test script diff --git a/tests/test-compass b/tests/test-compass --- a/tests/test-compass +++ b/tests/test-compass @@ -54,7 +54,7 @@ merge_commit() { echo "merging $1" $HGDO merge $1 - hg compass + hg_compass $HGCI -m "Merge in revision $1" } diff --git a/tests/test-compass.out b/tests/test-compass.out --- a/tests/test-compass.out +++ b/tests/test-compass.out @@ -22,19 +22,19 @@ #=============================================================================# # You are in a merge (with revision 7) # #=============================================================================# -Rev 11 dev-1.0 tip @b-tip [ 39 years] +Rev 11 dev-1.0 tip @b-tip [age] #-----------------------------------------------------------------------------# # Other heads # #-----------------------------------------------------------------------------# -Rev 10 dev-1.0 @anon [ 39 years] -Rev 9 dev-1.0 @anon [ 39 years] -Rev 7 dev-1.1 @b-tip [ 39 years] -Rev 6 dev-1.1 (feature-1.1a) [ 39 years] -Rev 5 dev-1.1 @anon [ 39 years] +Rev 10 dev-1.0 @anon [age] +Rev 9 dev-1.0 @anon [age] +Rev 7 dev-1.1 @b-tip [age] +Rev 6 dev-1.1 (feature-1.1a) [age] +Rev 5 dev-1.1 @anon [age] #-----------------------------------------------------------------------------# # Inactive branch heads # #-----------------------------------------------------------------------------# -Rev 0 default @b-tip [ 39 years] +Rev 0 default @b-tip [age] #-----------------------------------------------------------------------------# # Branch overview # #-----------------------------------------------------------------------------# @@ -60,22 +60,22 @@ #=============================================================================# # You are in a merge (with revision 23) # #=============================================================================# -Rev 13 dev-1.0 @b-tip [ 39 years] +Rev 13 dev-1.0 @b-tip [age] #-----------------------------------------------------------------------------# # Other heads # #-----------------------------------------------------------------------------# -Rev 23 feature-foo tip @closed @b-tip [ 39 years] -Rev 20 dev-1.2 @closed @b-tip [ 39 years] -Rev 17 dev-2.0 @b-tip [ 39 years] -Rev 10 dev-1.0 @anon [ 39 years] -Rev 9 dev-1.0 @anon [ 39 years] -Rev 6 dev-1.1 (feature-1.1a) [ 39 years] -Rev 5 dev-1.1 @anon [ 39 years] +Rev 23 feature-foo tip @closed @b-tip [age] +Rev 20 dev-1.2 @closed @b-tip [age] +Rev 17 dev-2.0 @b-tip [age] +Rev 10 dev-1.0 @anon [age] +Rev 9 dev-1.0 @anon [age] +Rev 6 dev-1.1 (feature-1.1a) [age] +Rev 5 dev-1.1 @anon [age] #-----------------------------------------------------------------------------# # Inactive branch heads # #-----------------------------------------------------------------------------# -Rev 0 default @b-tip [ 39 years] -Rev 7 dev-1.1 @b-tip [ 39 years] +Rev 0 default @b-tip [age] +Rev 7 dev-1.1 @b-tip [age] #-----------------------------------------------------------------------------# # Branch overview # #-----------------------------------------------------------------------------#