Mercurial > hg

view tests/test-merge-closedheads.out @ 8820:e8cb1fa0d4a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-cvsnt-mergepoints: make it work on OS X. - don't create file 'cvs' where directory 'CVS' already exists
author Greg Ward <greg-hg@gerg.ca>
date Mon, 15 Jun 2009 20:35:19 -0400
parents ca8d05e1f1d1
children a5576908b589
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
% 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)