Mercurial > evolve

comparison tests/test-push-checkheads-pruned-B8.t @ 2798:2280461343e5 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9c9c8c1eeb93
comparison
equal deleted inserted replaced
2797:74456bc055ae 2798:2280461343e5
64 $ hg up 0 64 $ hg up 0
65 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 65 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
66 $ mkcommit A2 66 $ mkcommit A2
67 created new head 67 created new head
68 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 68 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
69 obsoleted 1 changesets
70 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 69 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
71 obsoleted 1 changesets
72 $ hg debugobsolete --record-parents `getid "desc(B1)"` 70 $ hg debugobsolete --record-parents `getid "desc(B1)"`
73 obsoleted 1 changesets
74 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` 71 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
75 obsoleted 1 changesets
76 $ hg log -G --hidden 72 $ hg log -G --hidden
77 @ c1f8d089020f (draft): A2 73 @ c1f8d089020f (draft): A2
78 | 74 |
79 | x 262c8c798096 (draft): B1 75 | x 262c8c798096 (draft): B1
80 | | 76 | |
96 adding changesets 92 adding changesets
97 adding manifests 93 adding manifests
98 adding file changes 94 adding file changes
99 added 1 changesets with 1 changes to 1 files (+1 heads) 95 added 1 changesets with 1 changes to 1 files (+1 heads)
100 4 new obsolescence markers 96 4 new obsolescence markers
101 obsoleted 2 changesets
102 97
103 $ cd ../.. 98 $ cd ../..