view tests/test-issue322.out @ 10672:c2e1e637d4da stable

rebase: always check if rebasing onto an applied mq patch. Previously, it only checked for an mq patch if the user explicitly passed -d/--dest. But rebasing onto an mq patch is a bad idea regardless of how we determine the rebase destination.
author Greg Ward <greg-hg@gerg.ca>
date Tue, 02 Mar 2010 15:08:43 -0500
parents e3dffbdc6522
children
line wrap: on
line source

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file 'a' in dirstate clashes with 'a/a'
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory 'b' already in dirstate