Mercurial > hg

view tests/test-merge-closedheads.out @ 9014:87c05a78e588

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test python hook configured with python:[file]:[hook] syntax Adds a test for python hooks configured with python:[file]:[hook] syntax in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85) to 96% (82/85).
author Henri Wiechers <hwiechers@gmail.com>
date Fri, 26 Jun 2009 14:42:05 +0200
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)