Mercurial > hg

view tests/test-merge-closedheads.out @ 9637:64425c5a9257

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: minor refactoring of changeset_printer._show - use ctx.branch() instead of directly accessing the extra field "branch" - move definitions of locals ('extra' and 'branch') down to where they are used
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 24 Oct 2009 19:01:40 +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)