| author | Adrian Buehlmann <adrian@cadifra.com> |
| Thu, 02 Sep 2010 11:20:23 +0200 | |
| changeset 12143 | bf840a3d1af2 |
| parent 11202 | f974fe896921 |
| permissions | -rw-r--r-- |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
1 |
% init |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 |
% commit |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
3 |
adding 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
4 |
adding 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 |
% qnew mqbase |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 |
% qrefresh |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 |
% qdiff |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
8 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
9 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
10 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
11 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
12 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
13 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
14 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
15 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
16 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
17 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
19 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
20 |
% qdiff dirname |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
21 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
22 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
23 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
24 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
25 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
26 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
27 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
28 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
29 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
30 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
31 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
32 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
33 |
% patch file contents |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
34 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
35 |
# Parent |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
36 |
mqbase |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
37 |
|
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
38 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
39 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
40 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
41 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
42 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
43 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
44 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
45 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
46 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
47 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
48 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
49 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
50 |
% qrefresh 1 |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
51 |
% qdiff |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
52 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
53 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
54 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
55 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
56 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
57 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
58 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
59 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
60 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
61 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
62 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
63 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
64 |
% qdiff dirname |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
65 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
66 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
67 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
68 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
69 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
70 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
71 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
72 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
73 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
74 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
75 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
76 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
77 |
% patch file contents |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
78 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
79 |
# Parent |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
80 |
mqbase |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
81 |
|
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
82 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
83 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
84 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
85 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
86 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
87 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
88 |
% qrefresh . in subdir |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
89 |
% qdiff |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
90 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
91 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
92 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
93 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
94 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
95 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
96 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
97 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
98 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
99 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
100 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
101 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
102 |
% qdiff dirname |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
103 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
104 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
105 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
106 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
107 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
108 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
109 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
110 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
111 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
112 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
113 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
114 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
115 |
% patch file contents |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
116 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
117 |
# Parent |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
118 |
mqbase |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
119 |
|
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
120 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
121 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
122 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
123 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
124 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
125 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
126 |
% qrefresh in hg-root again |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
127 |
% qdiff |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
128 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
129 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
130 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
131 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
132 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
133 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
134 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
135 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
136 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
137 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
138 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
139 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
140 |
% qdiff dirname |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
141 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
142 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
143 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
144 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
145 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
146 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
147 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
148 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
149 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
150 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
151 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
152 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
153 |
% patch file contents |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
154 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
155 |
# Parent |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
156 |
mqbase |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
157 |
|
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
158 |
diff -r b55ecdccb5cf 1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
159 |
--- a/1/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
160 |
+++ b/1/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
161 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
162 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
163 |
+patched |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
164 |
diff -r b55ecdccb5cf 2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
165 |
--- a/2/base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
166 |
+++ b/2/base |
|
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
3136
diff
changeset
|
167 |
@@ -1,1 +1,1 @@ |
|
3136
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
168 |
-base |
|
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
169 |
+patched |
|
7177
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
170 |
|
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
171 |
% qrefresh --short tests: |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
172 |
% - add 1/base and 2/base one by one |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
173 |
% -- qdiff output |
|
7113
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
174 |
diff -r b55ecdccb5cf 1/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
175 |
--- a/1/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
176 |
+++ b/1/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
177 |
@@ -1,1 +1,1 @@ |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
178 |
-base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
179 |
+patched |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
180 |
diff -r b55ecdccb5cf 2/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
181 |
--- a/2/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
182 |
+++ b/2/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
183 |
@@ -1,1 +1,1 @@ |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
184 |
-base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
185 |
+patched |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
186 |
diff -r b55ecdccb5cf orphanchild |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
187 |
--- /dev/null |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
188 |
+++ b/orphanchild |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
189 |
@@ -0,0 +1,1 @@ |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
190 |
+orphan |
|
7177
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
191 |
% -- patch file content |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
192 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
193 |
# Parent |
|
7113
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
194 |
mqbase |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
195 |
|
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
196 |
diff -r b55ecdccb5cf 1/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
197 |
--- a/1/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
198 |
+++ b/1/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
199 |
@@ -1,1 +1,1 @@ |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
200 |
-base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
201 |
+patched |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
202 |
diff -r b55ecdccb5cf 2/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
203 |
--- a/2/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
204 |
+++ b/2/base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
205 |
@@ -1,1 +1,1 @@ |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
206 |
-base |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
207 |
+patched |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
208 |
A orphanchild |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
209 |
? base |
|
7177
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
210 |
% -- diff shows what is not in patch |
|
7113
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
211 |
diff |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
212 |
--- /dev/null |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
213 |
+++ b/orphanchild |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
214 |
@@ -0,0 +1,1 @@ |
|
f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
Mads Kiilerich <mads@kiilerich.com>
parents:
6801
diff
changeset
|
215 |
+orphan |
|
7177
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
216 |
% - before starting exclusive tests |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
217 |
1/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
218 |
2/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
219 |
% - exclude 2/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
220 |
1/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
221 |
% -- status shows 2/base as dirty |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
222 |
M 2/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
223 |
A orphanchild |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
224 |
? base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
225 |
% - remove 1/base and add 2/base again but not orphanchild |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
226 |
2/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
227 |
% - add 1/base with include filter - and thus remove 2/base from patch |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
228 |
1/base |
|
09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
Mads Kiilerich <mads@kiilerich.com>
parents:
7113
diff
changeset
|
229 |
|
|
6801
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
230 |
% create test repo |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
231 |
adding a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
232 |
% capture changes |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
233 |
diff --git a/a b/ab |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
234 |
copy from a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
235 |
copy to ab |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
236 |
--- a/a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
237 |
+++ b/ab |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
238 |
@@ -1,1 +1,2 @@ |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
239 |
a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
240 |
+b |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
241 |
diff --git a/a b/ac |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
242 |
copy from a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
243 |
copy to ac |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
244 |
--- a/a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
245 |
+++ b/ac |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
246 |
@@ -1,1 +1,2 @@ |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
247 |
a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
248 |
+c |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
249 |
% refresh and check changes again |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
250 |
diff --git a/a b/ab |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
251 |
copy from a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
252 |
copy to ab |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
253 |
--- a/a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
254 |
+++ b/ab |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
255 |
@@ -1,1 +1,2 @@ |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
256 |
a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
257 |
+b |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
258 |
diff --git a/a b/ac |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
259 |
copy from a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
260 |
copy to ac |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
261 |
--- a/a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
262 |
+++ b/ac |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
263 |
@@ -1,1 +1,2 @@ |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
264 |
a |
|
71e339714586
mq: fix qrefresh losing copy information (issue 1134)
Patrick Mezard <pmezard@gmail.com>
parents:
5863
diff
changeset
|
265 |
+c |
|
7566
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
266 |
% issue1441 without git patches |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
267 |
diff -r 000000000000 b |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
268 |
--- /dev/null |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
269 |
+++ b/b |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
270 |
@@ -0,0 +1,1 @@ |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
271 |
+a |
|
10367
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
272 |
% issue2025: qrefresh does not honor filtering options when tip != qtip |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
273 |
% refresh with tip != qtip |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
274 |
% status after refresh |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
275 |
M a |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
276 |
% b after refresh |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
277 |
b |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
278 |
b |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
279 |
% patch file after refresh |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
280 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
281 |
# Parent |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10367
diff
changeset
|
282 |
|
|
10367
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
283 |
diff -r 1a60229be7ac b |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
284 |
--- a/b |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
285 |
+++ b/b |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
286 |
@@ -1,1 +1,2 @@ |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
287 |
b |
|
b8801b58bbd8
test-mq-qrefresh: test qrefresh when tip != qtip
Patrick Mezard <pmezard@gmail.com>
parents:
7566
diff
changeset
|
288 |
+b |
|
7566
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
289 |
% issue1441 with git patches |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
290 |
diff --git a/b b/b |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
291 |
new file mode 100644 |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
292 |
--- /dev/null |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
293 |
+++ b/b |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
294 |
@@ -0,0 +1,1 @@ |
|
5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Patrick Mezard <pmezard@gmail.com>
parents:
7177
diff
changeset
|
295 |
+a |