Mercurial > evolve
comparison tests/test-obsolete.t @ 1759:e878999e6af4 mercurial-3.8
merge with latest fix
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sat, 29 Oct 2016 14:49:37 +0200 |
| parents | b0a67ebc464e a7dcfff8c4a9 |
| children | 147aa58d8962 2be05515b142 |
comparison
equal
deleted
inserted
replaced
| 1747:b0a67ebc464e | 1759:e878999e6af4 |
|---|---|
| 129 user: test | 129 user: test |
| 130 date: Thu Jan 01 00:00:00 1970 +0000 | 130 date: Thu Jan 01 00:00:00 1970 +0000 |
| 131 summary: add obsol_c | 131 summary: add obsol_c |
| 132 | 132 |
| 133 working directory parent is obsolete! | 133 working directory parent is obsolete! |
| 134 (use "hg evolve" to update to its successor) | 134 (use 'hg evolve' to update to its successor) |
| 135 $ mkcommit d # 5 (on 3) | 135 $ mkcommit d # 5 (on 3) |
| 136 1 new unstable changesets | 136 1 new unstable changesets |
| 137 $ qlog -r 'obsolete()' | 137 $ qlog -r 'obsolete()' |
| 138 3 | 138 3 |
| 139 - 0d3f46688ccc | 139 - 0d3f46688ccc |
| 699 Check import reports new unstable changeset: | 699 Check import reports new unstable changeset: |
| 700 | 700 |
| 701 $ hg up --hidden 2 | 701 $ hg up --hidden 2 |
| 702 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 702 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 703 working directory parent is obsolete! | 703 working directory parent is obsolete! |
| 704 (use "hg evolve" to update to its successor) | 704 (use 'hg evolve' to update to its successor) |
| 705 $ hg export 9468a5f5d8b2 | hg import - | 705 $ hg export 9468a5f5d8b2 | hg import - |
| 706 applying patch from stdin | 706 applying patch from stdin |
| 707 1 new unstable changesets | 707 1 new unstable changesets |
| 708 | 708 |
| 709 | 709 |