Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-default.out @ 3070:24c1db20990c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include section name and parameter name (if available) in config errors. Added tests for this.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 08 Sep 2006 10:01:45 +0200
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
abort: repo has 3 heads - please merge with an explicit rev
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because > 2 heads
abort: repo has 3 heads - please merge with an explicit rev
% should succeed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should succeed - 2 heads
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should fail because 1 head
abort: there is nothing to merge - use "hg update" instead