| author | Bryan O'Sullivan <bos@serpentine.com> |
| Mon, 24 Aug 2009 16:30:42 -0700 | |
| changeset 9486 | dd8d10c36c9c |
| parent 9110 | 561ff8d9e4f0 |
| child 10185 | 7637fe4f525d |
| permissions | -rw-r--r-- |
|
4333
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 |
adding a |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
adding b |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 |
copy .hg/patches to .hg/patches.1 |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 |
M b |
|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4437
diff
changeset
|
6 |
created new head |
|
4333
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 |
a |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 |
b |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 |
merging with queue at: .hg/patches.1 |
|
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 |
applying rm_a |
| 7627 | 11 |
now at: rm_a |
|
4333
4f721e96f1de
Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 |
b |
|
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8433
diff
changeset
|
13 |
popping rm_a |
|
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8433
diff
changeset
|
14 |
popping .hg.patches.merge.marker |
| 7627 | 15 |
patch queue now empty |
|
6628
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
16 |
|
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
17 |
% init t2 |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
18 |
adding a |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
19 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
20 |
% create the reference queue |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
21 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
22 |
% merge |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
23 |
merging with queue at refqueue |
|
f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
24 |
applying patcha |
| 7627 | 25 |
now at: patcha |