Mercurial > evolve
diff tests/test-push-checkheads-superceed-A6.t @ 2798:2280461343e5 mercurial-4.2
test-compat: merge mercurial-4.2 with the new stable branch content
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 25 Jul 2017 03:41:15 +0200 |
| parents | 21f06d932231 |
| children |
line wrap: on
line diff
--- a/tests/test-push-checkheads-superceed-A6.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A6.t Tue Jul 25 03:41:15 2017 +0200 @@ -68,9 +68,7 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - obsoleted 1 changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - obsoleted 1 changesets $ hg log -G --hidden @ d70a1f75a020 (draft): B1 | @@ -96,6 +94,5 @@ adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) 2 new obsolescence markers - obsoleted 2 changesets $ cd ../..