Mercurial > evolve

comparison tests/test-topic.t @ 1849:9218f91619f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: note when switching topics
author Matt Mackall <mpm@selenic.com>
date Wed, 10 Jun 2015 16:44:49 -0500
parents 9fa5b8f4e98e
children 67d53e8e0c1a
comparison
equal deleted inserted replaced
1848:9a81657deec2 1849:9218f91619f6
48 $ echo >> fran work >> beta 48 $ echo >> fran work >> beta
49 $ hg ci -m 'start on fran' 49 $ hg ci -m 'start on fran'
50 created new head 50 created new head
51 $ hg co narf 51 $ hg co narf
52 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 52 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
53 switching to topic narf
53 $ hg topic 54 $ hg topic
54 fran 55 fran
55 * narf 56 * narf
56 $ echo 'narf!!!' >> alpha 57 $ echo 'narf!!!' >> alpha
57 $ hg ci -m 'narf!' 58 $ hg ci -m 'narf!'
213 $ hg topics 214 $ hg topics
214 * query 215 * query
215 $ cd ../pinky 216 $ cd ../pinky
216 $ hg co query 217 $ hg co query
217 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 218 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
219 switching to topic query
218 $ echo answer >> alpha 220 $ echo answer >> alpha
219 $ hg ci -m 'Narf is like `zort` or `poit`!' 221 $ hg ci -m 'Narf is like `zort` or `poit`!'
220 $ hg merge narf 222 $ hg merge narf
221 merging alpha 223 merging alpha
222 warning: conflicts during merge. 224 warning: conflicts during merge.
416 418
417 Move to fran, note that the topic activates, then deactivate the topic. 419 Move to fran, note that the topic activates, then deactivate the topic.
418 420
419 $ hg co fran 421 $ hg co fran
420 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 422 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
423 switching to topic fran
421 $ hg topics 424 $ hg topics
422 * fran 425 * fran
423 $ hg topics --clear 426 $ hg topics --clear
424 $ echo fran? >> beta 427 $ echo fran? >> beta
425 $ hg ci -m 'fran?' 428 $ hg ci -m 'fran?'