Mercurial > hg
annotate tests/test-mq-qfold.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.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 561ff8d9e4f0 |
children | 296a0b14a686 |
rev | line source |
---|---|
8426 | 1 % init |
2 adding a | |
3 % fold in the middle of the queue | |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8426
diff
changeset
|
4 popping p3 |
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8426
diff
changeset
|
5 popping p2 |
8426 | 6 now at: p1 |
7 --- a/a | |
8 +++ b/a | |
9 @@ -1,1 +1,2 @@ | |
10 a | |
11 +a | |
12 p1 | |
13 p3 | |
14 --- a/a | |
15 +++ b/a | |
16 @@ -1,1 +1,3 @@ | |
17 a | |
18 +a | |
19 +b | |
20 % fold with local changes | |
21 abort: local changes found, refresh first | |
22 --- a/a | |
23 +++ b/a | |
24 @@ -1,1 +1,3 @@ | |
25 a | |
26 +a | |
27 +b |