Mercurial > evolve
comparison tests/test-push-checkheads-superceed-A4.t @ 3108:9c9c8c1eeb93 mercurial-4.2
test-compat: merge with mercurial-4.3 branch
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 18:34:22 +0200 |
parents | 2280461343e5 |
children |
comparison
equal
deleted
inserted
replaced
3107:1f61525727bf | 3108:9c9c8c1eeb93 |
---|---|
46 $ hg up 0 | 46 $ hg up 0 |
47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
48 $ mkcommit A1 | 48 $ mkcommit A1 |
49 created new head | 49 created new head |
50 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 50 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
51 obsoleted 1 changesets | |
52 $ mkcommit B0 | 51 $ mkcommit B0 |
53 $ hg log -G --hidden | 52 $ hg log -G --hidden |
54 @ f40ded968333 (draft): B0 | 53 @ f40ded968333 (draft): B0 |
55 | | 54 | |
56 o f6082bc4ffef (draft): A1 | 55 o f6082bc4ffef (draft): A1 |
69 adding changesets | 68 adding changesets |
70 adding manifests | 69 adding manifests |
71 adding file changes | 70 adding file changes |
72 added 2 changesets with 2 changes to 2 files (+1 heads) | 71 added 2 changesets with 2 changes to 2 files (+1 heads) |
73 1 new obsolescence markers | 72 1 new obsolescence markers |
74 obsoleted 1 changesets | |
75 | 73 |
76 $ cd ../../ | 74 $ cd ../../ |