Mercurial > hg

view tests/test-merge5.out @ 10969:ca052b484e56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: remove parents parameter to workingctx it was needed before the refactor of commit, workingctx always uses the dirstate now.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 21 Apr 2010 01:18:31 +0200
parents 68a1b9d0663e
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved