tests/test-merge-default.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 16 Mar 2007 22:48:20 -0300
changeset 4233 03a665f9f913
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rw-r--r--
util._matcher: use "." as the root of empty {rel,}path patterns Should fix issue332. Really.

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