tests/test-merge5.out
author Abderrahim Kitouni <a.kitouni@gmail.com>
Sat, 04 Jul 2009 14:18:15 +0100
changeset 9092 9aebeea7ac00
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)

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')