M tests/test-compass +1 -1
@@ 54,7 54,7 @@ close_branch() {
merge_commit() {
echo "merging $1"
$HGDO merge $1
- hg compass
+ hg_compass
$HGCI -m "Merge in revision $1"
}
M tests/test-compass.out +17 -17
@@ 22,19 22,19 @@ merging dev-1.1
#=============================================================================#
# 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 @@ merging feature-foo
#=============================================================================#
# 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 #
#-----------------------------------------------------------------------------#