comparison tests/test-exchange-obsmarkers-case-A4.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 67b59d1657cf
comparison
equal deleted inserted replaced
2797:74456bc055ae 2798:2280461343e5
62 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 62 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
63 $ mkcommit A1 63 $ mkcommit A1
64 created new head 64 created new head
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` 65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
67 obsoleted 1 changesets
68 $ hg log -G --hidden 67 $ hg log -G --hidden
69 @ e5ea8f9c7314 (draft): A1 68 @ e5ea8f9c7314 (draft): A1
70 | 69 |
71 | o 06055a7959d4 (draft): B 70 | o 06055a7959d4 (draft): B
72 | | 71 | |