comparison tests/test-userguide.t @ 2854:66796d7b5415

warning: rename unstable warning message unstable has been renamed into orphan. Update the warning message when new orphan changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
author Boris Feld <boris.feld@octobus.net>
date Thu, 24 Aug 2017 09:11:06 +0200
parents 2b8b960a04ee
children 06844693bb21
comparison
equal deleted inserted replaced
2853:cec3d2ea2eeb 2854:66796d7b5415
163 163
164 example 7: amend an older changeset (figures 6, 7) 164 example 7: amend an older changeset (figures 6, 7)
165 $ hg update -q 11 165 $ hg update -q 11
166 $ echo 'fix fix fix fix' > file2.c 166 $ echo 'fix fix fix fix' > file2.c
167 $ hg amend -u bob -d '6 0' 167 $ hg amend -u bob -d '6 0'
168 2 new unstable changesets 168 2 new orphan changesets
169 $ hg shortlog -r 'obsolete()' 169 $ hg shortlog -r 'obsolete()'
170 11:3e1cb8f70c02 draft fix bug 17 170 11:3e1cb8f70c02 draft fix bug 17
171 $ hg shortlog -r "orphan()" 171 $ hg shortlog -r "orphan()"
172 12:debd46bb29dc draft cleanup 172 12:debd46bb29dc draft cleanup
173 13:dadcbba2d606 draft feature 23 173 13:dadcbba2d606 draft feature 23
216 ~ 216 ~
217 217
218 example 8: prune an older changeset (figures 8, 9) 218 example 8: prune an older changeset (figures 8, 9)
219 $ hg prune 19 219 $ hg prune 19
220 1 changesets pruned 220 1 changesets pruned
221 1 new unstable changesets 221 1 new orphan changesets
222 $ hg --hidden shortlog -G -r 18:: 222 $ hg --hidden shortlog -G -r 18::
223 @ 20:ea8fafca914b draft more work 223 @ 20:ea8fafca914b draft more work
224 | 224 |
225 x 19:b23d06b457a8 draft debug hack 225 x 19:b23d06b457a8 draft debug hack
226 | 226 |
255 | 255 |
256 o 21:4393e5877437 draft more work 256 o 21:4393e5877437 draft more work
257 | 257 |
258 ~ 258 ~
259 $ hg uncommit file2.c 259 $ hg uncommit file2.c
260 1 new unstable changesets 260 1 new orphan changesets
261 $ hg status 261 $ hg status
262 M file2.c 262 M file2.c
263 $ hg revert file2.c 263 $ hg revert file2.c
264 $ hg evolve --all --any 264 $ hg evolve --all --any
265 move:[23] fix bug 67 265 move:[23] fix bug 67
295 | 295 |
296 o 25:0d972d6888e6 draft fix bug 67 296 o 25:0d972d6888e6 draft fix bug 67
297 | 297 |
298 ~ 298 ~
299 $ hg uncommit file2.c 299 $ hg uncommit file2.c
300 1 new unstable changesets 300 1 new orphan changesets
301 $ hg status 301 $ hg status
302 M file2.c 302 M file2.c
303 $ hg commit -m 'useful tweak' 303 $ hg commit -m 'useful tweak'
304 $ hg --hidden shortlog -G -r 25:: 304 $ hg --hidden shortlog -G -r 25::
305 @ 29:51e0d8c0a922 draft useful tweak 305 @ 29:51e0d8c0a922 draft useful tweak