Mercurial > evolve
comparison tests/test-topic.t @ 1953:bdc5bb223b50
commit: wrap "commitstatus" to take topic into account
The "created new head" message was appearing for every single commit made on a
topic. It should now properly only appears when a new head is actually created
on a topic.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 30 Mar 2016 23:58:30 -0700 |
| parents | 1cc2b87c91df |
| children | 9c7665e3107b |
comparison
equal
deleted
inserted
replaced
| 1952:665d6322994e | 1953:bdc5bb223b50 |
|---|---|
| 89 * narf | 89 * narf |
| 90 $ hg log -r . -T '{topics}\n' | 90 $ hg log -r . -T '{topics}\n' |
| 91 narf | 91 narf |
| 92 $ echo 'narf!!!' >> alpha | 92 $ echo 'narf!!!' >> alpha |
| 93 $ hg ci -m 'narf!' | 93 $ hg ci -m 'narf!' |
| 94 created new head | |
| 95 $ hg log -G | 94 $ hg log -G |
| 96 @ changeset: 6:7c34953036d6 | 95 @ changeset: 6:7c34953036d6 |
| 97 | tag: tip | 96 | tag: tip |
| 98 | topic: narf | 97 | topic: narf |
| 99 | parent: 4:fb147b0b417c | 98 | parent: 4:fb147b0b417c |
| 291 $ hg co query | 290 $ hg co query |
| 292 switching to topic query | 291 switching to topic query |
| 293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 294 $ echo answer >> alpha | 293 $ echo answer >> alpha |
| 295 $ hg ci -m 'Narf is like `zort` or `poit`!' | 294 $ hg ci -m 'Narf is like `zort` or `poit`!' |
| 296 created new head | |
| 297 $ hg merge narf | 295 $ hg merge narf |
| 298 merging alpha | 296 merging alpha |
| 299 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') | 297 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
| 300 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 298 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 301 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 299 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 303 $ hg revert -r narf alpha | 301 $ hg revert -r narf alpha |
| 304 $ hg resolve -m alpha | 302 $ hg resolve -m alpha |
| 305 (no more unresolved files) | 303 (no more unresolved files) |
| 306 $ hg topic narf | 304 $ hg topic narf |
| 307 $ hg ci -m 'Finish narf' | 305 $ hg ci -m 'Finish narf' |
| 308 created new head | |
| 309 $ hg topics | 306 $ hg topics |
| 310 fran | 307 fran |
| 311 * narf | 308 * narf |
| 312 query | 309 query |
| 313 $ hg debugnamecomplete # branch:topic here is a buggy side effect | 310 $ hg debugnamecomplete # branch:topic here is a buggy side effect |