tests/test-merge5.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Wed, 21 Jul 2010 11:53:09 +0900
changeset 11699 da0b9109186d
parent 9717 68a1b9d0663e
permissions -rw-r--r--
mq: support "qimport --existing --name renametothis thatexistingpatch" Before this change, the command would abort with a not too clear "patch renametothis does not exist" error. This change makes: qimport --existing --name renametothis thatexistingpatch equivalent to: qimport --existing thatexistingpatch; qrename thatexistingpatch renametothis

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