Mercurial > evolve

comparison tests/test-userguide.t @ 3106:a867d59ea97a mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes from phase renaming We keep using the old name for the older version. test has to reflect that.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 20:04:13 +0200
parents f5d472b7e800
children 9c9c8c1eeb93 85cdce113c2c
comparison
equal deleted inserted replaced
3105:f5d472b7e800 3106:a867d59ea97a
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 -r 3e1cb8f70c02 165 $ hg update -q -r 3e1cb8f70c02
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 orphan changesets 168 2 new unstable 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 b23d06b457a8 219 $ hg prune b23d06b457a8
220 1 changesets pruned 220 1 changesets pruned
221 1 new orphan changesets 221 1 new unstable changesets
222 $ hg --hidden shortlog -G -r b23d06b457a8:: 222 $ hg --hidden shortlog -G -r b23d06b457a8::
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 |
253 | 253 |
254 o 21:4393e5877437 draft more work 254 o 21:4393e5877437 draft more work
255 | 255 |
256 ~ 256 ~
257 $ hg uncommit file2.c 257 $ hg uncommit file2.c
258 1 new orphan changesets 258 1 new unstable changesets
259 $ hg status 259 $ hg status
260 M file2.c 260 M file2.c
261 $ hg revert file2.c 261 $ hg revert file2.c
262 $ hg evolve --all --any 262 $ hg evolve --all --any
263 move:[23] fix bug 67 263 move:[23] fix bug 67
293 | 293 |
294 o 25:0d972d6888e6 draft fix bug 67 294 o 25:0d972d6888e6 draft fix bug 67
295 | 295 |
296 ~ 296 ~
297 $ hg uncommit file2.c 297 $ hg uncommit file2.c
298 1 new orphan changesets 298 1 new unstable changesets
299 $ hg status 299 $ hg status
300 M file2.c 300 M file2.c
301 $ hg commit -m 'useful tweak' 301 $ hg commit -m 'useful tweak'
302 $ hg --hidden shortlog -G -r 0d972d6888e6:: 302 $ hg --hidden shortlog -G -r 0d972d6888e6::
303 @ 29:51e0d8c0a922 draft useful tweak 303 @ 29:51e0d8c0a922 draft useful tweak