view tests/test-merge-force.out @ 11271:d1aca0863a9d

mq: prevent the creation of a queue whose name is already taken Each check is moved under the code handling the relevant option, and a new one is added for --create. This fixes duplicated entries being added to the queues list.
author Cédric Duval <cedricduval@free.fr>
date Thu, 03 Jun 2010 20:40:23 +0200
parents 3682a19bb637
children
line wrap: on
line source

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list changes)
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b