Mercurial > evolve

comparison tests/test-topic-push-concurrent-on.t @ 3418:85cdce113c2c mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Jan 2018 04:35:34 +0100
parents f5d472b7e800 f7129e3d5a38
children 537fd9a86c06
comparison
equal deleted inserted replaced
3380:62f742d144da 3418:85cdce113c2c
56 $ hg up 'desc(CA)' 56 $ hg up 'desc(CA)'
57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
58 $ hg add ccc 58 $ hg add ccc
59 $ hg commit -m 'CC' 59 $ hg commit -m 'CC'
60 created new head 60 created new head
61 (consider using topic for lightweight branches. See 'hg help topic')
61 $ hg outgoing -G 62 $ hg outgoing -G
62 comparing with $TESTTMP/main (glob) 63 comparing with $TESTTMP/main (glob)
63 searching for changes 64 searching for changes
64 @ 2 default draft CC 65 @ 2 default draft CC
65 66
311 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 312 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
312 $ echo aaa > ggg 313 $ echo aaa > ggg
313 $ hg add ggg 314 $ hg add ggg
314 $ hg commit -m 'CG' 315 $ hg commit -m 'CG'
315 created new head 316 created new head
317 (consider using topic for lightweight branches. See 'hg help topic')
316 $ hg up 'desc(CF)' 318 $ hg up 'desc(CF)'
317 switching to topic babar 319 switching to topic babar
318 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 320 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
319 $ hg merge 'desc(CG)' 321 $ hg merge 'desc(CG)'
320 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 322 1 files updated, 0 files merged, 0 files removed, 0 files unresolved