Mercurial > hg
view tests/test-merge-default.out @ 8033:aeb4a5c7a28e
commands: consistently write switches as -a/--abc
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 08 Apr 2009 21:20:31 +0200 |
parents | 1fe6f365df2e |
children | 50b6af595e0c |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because not at a head abort: branch 'default' has 3 heads - please merge with an explicit rev 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because > 2 heads abort: branch 'default' has 3 heads - please merge with an explicit rev % should succeed 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should succeed - 2 heads 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should fail because at tip abort: there is nothing to merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because 1 head abort: there is nothing to merge - use "hg update" instead