Mercurial > evolve

comparison tests/test-obsolete.t @ 1763:6d54fd20bb81 mercurial-3.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with latest fix
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 29 Oct 2016 15:07:27 +0200
parents bc590681de77 147aa58d8962
children 1554b30b18eb
comparison
equal deleted inserted replaced
1751:bc590681de77 1763:6d54fd20bb81
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
704 Check import reports new unstable changeset: 704 Check import reports new unstable changeset:
705 705
706 $ hg up --hidden 2 706 $ hg up --hidden 2
707 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 707 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
708 working directory parent is obsolete! 708 working directory parent is obsolete!
709 (use "hg evolve" to update to its successor) 709 (use 'hg evolve' to update to its successor)
710 $ hg export 9468a5f5d8b2 | hg import - 710 $ hg export 9468a5f5d8b2 | hg import -
711 applying patch from stdin 711 applying patch from stdin
712 1 new unstable changesets 712 1 new unstable changesets
713 713
714 714