Mercurial > hg
view tests/test-merge-closedheads.out @ 11916:d1ea16ca6520
tests: unify test-subrepo-svn
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 17 Aug 2010 16:53:03 +0200 |
parents | ee876e42dd74 |
children |
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) % hg update -C 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % hg branch some-branch marked working directory as branch some-branch % hg commit % hg commit --close-branch % hg update default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % hg merge some-branch 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % hg commit (no reopening of some-branch)