Mercurial > evolve

comparison tests/test-obsolete.t @ 79:9906560f585e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[obsolete] issue a warning when parent of current directory is obsolete.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 14 Sep 2011 19:20:38 +0200
parents d7b11772f0b5
children 5d029a358252
comparison
equal deleted inserted replaced
78:ddcc4bb6c4d4 79:9906560f585e
65 2 65 2
66 - 4538525df7e2 66 - 4538525df7e2
67 3 67 3
68 - 0d3f46688ccc 68 - 0d3f46688ccc
69 $ hg up 3 -q 69 $ hg up 3 -q
70 Working directory parent is obsolete
70 $ mkcommit d # 5 (on 3) 71 $ mkcommit d # 5 (on 3)
71 $ qlog -r 'obsolete()' 72 $ qlog -r 'obsolete()'
72 3 73 3
73 - 0d3f46688ccc 74 - 0d3f46688ccc
74 75
96 1 97 1
97 - 7c3bad9141dc 98 - 7c3bad9141dc
98 0 99 0
99 - 1f0dee641bb7 100 - 1f0dee641bb7
100 $ hg up 3 -q 101 $ hg up 3 -q
102 Working directory parent is obsolete
101 $ mkcommit obsol_d # 6 103 $ mkcommit obsol_d # 6
102 created new head 104 created new head
103 $ hg debugobsolete 6 5 105 $ hg debugobsolete 6 5
104 $ qlog 106 $ qlog
105 6 107 6
134 0 136 0
135 - 1f0dee641bb7 137 - 1f0dee641bb7
136 $ qlog -R ../other-new -r 'obsolete()' 138 $ qlog -R ../other-new -r 'obsolete()'
137 2 139 2
138 - 0d3f46688ccc 140 - 0d3f46688ccc
139 $ hg up -q .^ 141 $ hg up -q .^ # 3
142 Working directory parent is obsolete
140 $ mkcommit "obsol_d'" # 7 143 $ mkcommit "obsol_d'" # 7
141 created new head 144 created new head
142 $ hg debugobsolete 7 6 145 $ hg debugobsolete 7 6
143 $ hg pull -R ../other-new . 146 $ hg pull -R ../other-new .
144 pulling from . 147 pulling from .
216 0 219 0
217 - 1f0dee641bb7 220 - 1f0dee641bb7
218 221
219 Test rollback support 222 Test rollback support
220 223
221 $ hg up .^ -q 224 $ hg up .^ -q # 3
225 Working directory parent is obsolete
222 $ mkcommit "obsol_d''" 226 $ mkcommit "obsol_d''"
223 created new head 227 created new head
224 $ hg debugobsolete 8 7 228 $ hg debugobsolete 8 7
225 $ hg -R ../other-new pull . 229 $ hg -R ../other-new pull .
226 pulling from . 230 pulling from .