Mercurial > evolve
diff tests/test-obsolete.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 31 Jan 2021 16:15:26 +0800 |
parents | d04a9bf34b79 669270305ccb |
children | 0f32359bcf3e 55e9987b8384 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Sun Jan 31 16:06:16 2021 +0800 +++ b/tests/test-obsolete.t Sun Jan 31 16:15:26 2021 +0800 @@ -194,7 +194,7 @@ checking manifests crosschecking files in changesets and manifests checking files - checked 5 changesets with 5 changes to 5 files + 5 files, 5 changesets, 5 total revisions $ qlog -R ../other-new -r 'obsolete()' 2 - 0d3f46688ccc @@ -284,7 +284,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 909a0fb57e5d (1 drafts) + new changesets 909a0fb57e5d (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 @@ -377,7 +377,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 159dfc9fa5d3 (1 drafts) + new changesets 159dfc9fa5d3 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior