tests/test-merge-default.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 15 Feb 2007 08:49:20 -0200
changeset 4091 3d7480ada3e5
parent 2915 013921c753bd
child 5242 9cd6578750b9
permissions -rw-r--r--
hgweb/server.py: use hg.repository to create a repo object

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