diff --git a/tests/test-pull-createmarkers.t b/tests/test-pull-createmarkers.t --- a/tests/test-pull-createmarkers.t +++ b/tests/test-pull-createmarkers.t @@ -96,6 +96,7 @@ added 4 changesets with 1 changes to 4 files (+1 heads) 3 new obsolescence markers updating bookmark master + obsoleted 3 changesets Here we strip commits 6, 7, 8 to simulate what happens with landcastle, the push doesn't directly go to the server diff --git a/tests/test-pushrebase.t b/tests/test-pushrebase.t --- a/tests/test-pushrebase.t +++ b/tests/test-pushrebase.t @@ -425,6 +425,7 @@ adding file changes added 4 changesets with 2 changes to 4 files (+1 heads) 2 new obsolescence markers + obsoleted 2 changesets $ hg pull pulling from ssh://user@dummy/server @@ -690,6 +691,7 @@ adding file changes added 1 changesets with 0 changes to 1 files 1 new obsolescence markers + obsoleted 1 changesets $ hg log -G -T '{desc} {date|isodate}' o c 2001-09-09 01:46 +0000 | @@ -722,6 +724,7 @@ adding file changes added 3 changesets with 0 changes to 2 files (+1 heads) 3 new obsolescence markers + obsoleted 3 changesets $ cd .. @@ -763,6 +766,7 @@ adding file changes added 2 changesets with 0 changes to 2 files 2 new obsolescence markers + obsoleted 2 changesets $ hg -R ../p2mergeserver log -G -T '{rev}: {desc}' o 3: merge b and c |\ @@ -882,6 +886,7 @@ adding file changes added 2 changesets with 1 changes to 2 files (+1 heads) 1 new obsolescence markers + obsoleted 1 changesets $ hg up tip -q $ log --hidden @ a2 [public:722505d780e3]