tests/test-merge5.out
author Christian Ebert <blacktrash@gmx.net>
Tue, 30 Jun 2009 11:30:03 +0200
changeset 8996 23e941d7f507
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
keyword: make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.

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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')