Mercurial > hg

view tests/test-merge-closedheads.out @ 11447:ac256cd2cb36 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.spec: don't include convert-repo - use "hg convert" instead
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 25 Jun 2010 19:59:22 +0200
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)