author | Brodie Rao <me+hg@dackz.net> |
Sat, 13 Feb 2010 23:34:15 -0500 | |
changeset 10453 | 7edc649f9f7e |
parent 10397 | 8cb81d75730c |
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 |
|
10186
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
28 |
reverting a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
29 |
% fold git patch into a regular patch, expect git patch |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
30 |
popping git |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
31 |
now at: regular |
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10186
diff
changeset
|
32 |
# HG changeset patch |
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10186
diff
changeset
|
33 |
# Parent |
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10186
diff
changeset
|
34 |
|
10186
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
35 |
diff --git a/a b/a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
36 |
--- a/a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
37 |
+++ b/a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
38 |
@@ -1,3 +1,4 @@ |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
39 |
a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
40 |
a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
41 |
b |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
42 |
+a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
43 |
diff --git a/a b/aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
44 |
copy from a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
45 |
copy to aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
46 |
--- a/a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
47 |
+++ b/aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
48 |
@@ -1,3 +1,4 @@ |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
49 |
a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
50 |
a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
51 |
b |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
52 |
+a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
53 |
popping regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
54 |
now at: p1 |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
55 |
% fold regular patch into a git patch, expect git patch |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
56 |
popping regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
57 |
now at: git |
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10186
diff
changeset
|
58 |
# HG changeset patch |
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10186
diff
changeset
|
59 |
# Parent |
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10186
diff
changeset
|
60 |
|
10186
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
61 |
diff --git a/a b/aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
62 |
copy from a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
63 |
copy to aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
64 |
--- a/a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
65 |
+++ b/aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
66 |
@@ -1,3 +1,4 @@ |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
67 |
a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
68 |
a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
69 |
b |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
9110
diff
changeset
|
70 |
+b |