Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-B5.t @ 3935:9af0e2b0bdd7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 03 Aug 2018 00:19:47 +0200 |
parents | d5adce52cef4 |
children | 98941c28f3e2 e268f7fd7839 |
comparison
equal
deleted
inserted
replaced
3934:d55a6fef9eb9 | 3935:9af0e2b0bdd7 |
---|---|
69 $ mkcommit A1 | 69 $ mkcommit A1 |
70 created new head | 70 created new head |
71 $ mkcommit B1 | 71 $ mkcommit B1 |
72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` | 72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` |
73 obsoleted 1 changesets | 73 obsoleted 1 changesets |
74 2 new orphan changesets | |
75 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` | 74 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` |
76 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` | 75 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` |
77 obsoleted 1 changesets | 76 obsoleted 1 changesets |
78 $ hg prune -qd '0 0' 'desc(B1)' | 77 $ hg prune -qd '0 0' 'desc(B1)' |
79 $ hg log -G --hidden | 78 $ hg log -G --hidden |
80 x 069b05c3876d (draft): B1 | 79 x 069b05c3876d (draft): B1 |
81 | | 80 | |
82 @ e5ea8f9c7314 (draft): A1 | 81 @ e5ea8f9c7314 (draft): A1 |
83 | | 82 | |
84 | * 1d0f3cd25300 (draft): C | 83 | o 1d0f3cd25300 (draft): C |
85 | | | 84 | | |
86 | x 6e72f0a95b5e (draft): B0 | 85 | x 6e72f0a95b5e (draft): B0 |
87 | | | 86 | | |
88 | x 28b51eb45704 (draft): A0 | 87 | x 28b51eb45704 (draft): A0 |
89 |/ | 88 |/ |