Mercurial > evolve
comparison tests/test-checkheads-pruned-B8.t @ 2255:5b33df335b6c
checkheads: add test where the rewrite of the other branch is not direct
This will help testing that our logic is properly transitive.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 31 Mar 2017 13:47:14 +0200 |
parents | 2f71f6234b06 |
children |
comparison
equal
deleted
inserted
replaced
2254:446ed4c21bf6 | 2255:5b33df335b6c |
---|---|
63 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 63 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
64 $ mkcommit A2 | 64 $ mkcommit A2 |
65 created new head | 65 created new head |
66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
67 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | 67 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
68 $ hg debugobsolete `getid "desc(B1)"` | 68 $ hg debugobsolete --record-parents `getid "desc(B1)"` |
69 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` | 69 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` |
70 $ hg log -G --hidden | 70 $ hg log -G --hidden |
71 @ c1f8d089020f (draft): A2 | 71 @ c1f8d089020f (draft): A2 |
72 | | 72 | |
73 | x 262c8c798096 (draft): B1 | 73 | x 262c8c798096 (draft): B1 |
89 searching for changes | 89 searching for changes |
90 adding changesets | 90 adding changesets |
91 adding manifests | 91 adding manifests |
92 adding file changes | 92 adding file changes |
93 added 1 changesets with 1 changes to 1 files (+1 heads) | 93 added 1 changesets with 1 changes to 1 files (+1 heads) |
94 2 new obsolescence markers | 94 4 new obsolescence markers |
95 | 95 |