author | Patrick Mezard <pmezard@gmail.com> |
Sun, 13 Dec 2009 18:06:24 +0100 | |
changeset 10060 | f780b1098efc |
parent 9110 | 561ff8d9e4f0 |
child 10186 | 296a0b14a686 |
permissions | -rw-r--r-- |
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 |