Mercurial > hg

view tests/test-issue322.out @ 5250:585471802a01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn: check for branch movement in any log entry, not just the first. This fixes, for example, r4151 D /branches A /project/branches (from /branches:4150) A /project/tags (from /tags:4150) A /project/trunk (from /trunk:4150) D /tags D /trunk
author Brendan Cully <brendan@kublai.com>
date Mon, 27 Aug 2007 11:56:53 -0700
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