diff -r 5b66cff0e470 -r aff6bc2a6b2d tests/test-obsolete.t --- a/tests/test-obsolete.t Wed Jun 03 16:01:28 2015 -0700 +++ b/tests/test-obsolete.t Thu Jun 04 13:26:58 2015 -0700 @@ -183,8 +183,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files (+1 heads) - pushing 2 obsolescence markers (* bytes) (glob) - 2 obsolescence markers added + 2 new obsolescence markers $ hg -R ../other-new verify checking changesets checking manifests @@ -238,8 +237,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - pushing 3 obsolescence markers (* bytes) (glob) - 1 obsolescence markers added + 1 new obsolescence markers $ qlog -R ../other-new 5 - 95de7fc6918d @@ -261,8 +259,6 @@ pushing to ../other-new searching for changes no changes found - pushing 3 obsolescence markers (* bytes) (glob) - 0 obsolescence markers added [1] $ hg up --hidden -q .^ # 3 @@ -278,9 +274,8 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - pull obsolescence markers - 1 obsolescence markers added - (run 'hg heads' to see heads, 'hg merge' to merge) + 1 new obsolescence markers + (run 'hg heads .' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 - 909a0fb57e5d @@ -369,9 +364,8 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - pull obsolescence markers - 1 obsolescence markers added - (run 'hg heads' to see heads, 'hg merge' to merge) + 1 new obsolescence markers + (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior $ qlog @@ -544,8 +538,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to [12] files (re) - pushing 7 obsolescence markers (* bytes) (glob) - 3 obsolescence markers added + 3 new obsolescence markers $ hg up -q 10 $ mkcommit "obsol_d'''" created new head @@ -557,8 +550,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - pushing 8 obsolescence markers (* bytes) (glob) - 1 obsolescence markers added + 1 new obsolescence markers $ cd .. check bumped detection