Mercurial > hg
view tests/test-merge-closedheads.out @ 11208:2313dc4d9817
tests: fix bashism to load helpers.sh
`source` isn't available at POSIX sh.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 21 May 2010 20:55:18 +0900 |
parents | a5576908b589 |
children | ee876e42dd74 |
line wrap: on
line source
adding foo adding bar adding baz 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % fail with three heads 0 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: branch 'default' has 3 heads - please merge with an explicit rev (run 'hg heads .' to see heads) % close one of the heads 1 files updated, 0 files merged, 1 files removed, 0 files unresolved % succeed with two open heads 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)