view tests/test-mq-qimport.out @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

% qimport non-existing-file
abort: unable to read non-existing-file
% import email
adding email to series file
applying email
now at: email
% hg tip -v
changeset:   0:1a706973a7d8
tag:         qtip
tag:         tip
tag:         email
tag:         qbase
user:        Username in patch <[e-mail]>
date:        Thu Jan 01 00:00:00 1970 +0000
files:       x
description:
First line of commit message.

More text in commit message.


popping email
patch queue now empty
% import URL
adding url.diff to series file
url.diff
% import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
now at: url.diff
foo
popping url.diff
patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
now at: url.diff
foo2
popping url.diff
patch queue now empty
% build diff with CRLF
adding b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% qimport CRLF diff
adding b.diff to series file
applying b.diff
now at: b.diff
% try to import --push
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding another.diff to series file
applying another.diff
now at: another.diff
patch b.diff finalized without changeset message
patch another.diff finalized without changeset message