Mercurial > hg
comparison tests/test-mq-git.t @ 22520:9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sat, 20 Sep 2014 17:06:56 +0200 |
parents | b701610f6c56 |
children | 3f948469bac0 |
comparison
equal
deleted
inserted
replaced
22519:c87f2a5a6e49 | 22520:9d4ebb75de53 |
---|---|
15 $ hg add a | 15 $ hg add a |
16 $ hg qnew -d '0 0' -f adda | 16 $ hg qnew -d '0 0' -f adda |
17 | 17 |
18 $ cat .hg/patches/adda | 18 $ cat .hg/patches/adda |
19 # HG changeset patch | 19 # HG changeset patch |
20 # Parent 0000000000000000000000000000000000000000 | 20 # Date 0 0 |
21 # Date 0 0 | 21 # Parent 0000000000000000000000000000000000000000 |
22 | 22 |
23 diff -r 000000000000 -r ef8dafc9fa4c a | 23 diff -r 000000000000 -r ef8dafc9fa4c a |
24 --- /dev/null | 24 --- /dev/null |
25 +++ b/a | 25 +++ b/a |
26 @@ -0,0 +1,1 @@ | 26 @@ -0,0 +1,1 @@ |
31 $ hg cp a b | 31 $ hg cp a b |
32 $ hg qnew -d '0 0' -f copy | 32 $ hg qnew -d '0 0' -f copy |
33 | 33 |
34 $ cat .hg/patches/copy | 34 $ cat .hg/patches/copy |
35 # HG changeset patch | 35 # HG changeset patch |
36 # Date 0 0 | |
36 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | 37 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
37 # Date 0 0 | |
38 | 38 |
39 diff --git a/a b/b | 39 diff --git a/a b/b |
40 copy from a | 40 copy from a |
41 copy to b | 41 copy to b |
42 | 42 |
46 $ hg add regular | 46 $ hg add regular |
47 $ hg qnew -d '0 0' --git -f git | 47 $ hg qnew -d '0 0' --git -f git |
48 | 48 |
49 $ cat .hg/patches/git | 49 $ cat .hg/patches/git |
50 # HG changeset patch | 50 # HG changeset patch |
51 # Date 0 0 | |
51 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d | 52 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d |
52 # Date 0 0 | |
53 | 53 |
54 diff --git a/regular b/regular | 54 diff --git a/regular b/regular |
55 new file mode 100644 | 55 new file mode 100644 |
56 --- /dev/null | 56 --- /dev/null |
57 +++ b/regular | 57 +++ b/regular |
62 | 62 |
63 $ hg qrefresh -d '0 0' | 63 $ hg qrefresh -d '0 0' |
64 | 64 |
65 $ cat .hg/patches/git | 65 $ cat .hg/patches/git |
66 # HG changeset patch | 66 # HG changeset patch |
67 # Date 0 0 | |
67 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d | 68 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d |
68 # Date 0 0 | |
69 | 69 |
70 diff -r 99586d5f048c regular | 70 diff -r 99586d5f048c regular |
71 --- /dev/null | 71 --- /dev/null |
72 +++ b/regular | 72 +++ b/regular |
73 @@ -0,0 +1,1 @@ | 73 @@ -0,0 +1,1 @@ |
86 $ hg add a | 86 $ hg add a |
87 $ hg qnew -d '0 0' -f --git git | 87 $ hg qnew -d '0 0' -f --git git |
88 | 88 |
89 $ cat .hg/patches/git | 89 $ cat .hg/patches/git |
90 # HG changeset patch | 90 # HG changeset patch |
91 # Parent 0000000000000000000000000000000000000000 | 91 # Date 0 0 |
92 # Date 0 0 | 92 # Parent 0000000000000000000000000000000000000000 |
93 | 93 |
94 diff --git a/a b/a | 94 diff --git a/a b/a |
95 new file mode 100644 | 95 new file mode 100644 |
96 --- /dev/null | 96 --- /dev/null |
97 +++ b/a | 97 +++ b/a |
103 $ echo a >> a | 103 $ echo a >> a |
104 $ hg qrefresh -d '0 0' | 104 $ hg qrefresh -d '0 0' |
105 | 105 |
106 $ cat .hg/patches/git | 106 $ cat .hg/patches/git |
107 # HG changeset patch | 107 # HG changeset patch |
108 # Parent 0000000000000000000000000000000000000000 | 108 # Date 0 0 |
109 # Date 0 0 | 109 # Parent 0000000000000000000000000000000000000000 |
110 | 110 |
111 diff --git a/a b/a | 111 diff --git a/a b/a |
112 new file mode 100644 | 112 new file mode 100644 |
113 --- /dev/null | 113 --- /dev/null |
114 +++ b/a | 114 +++ b/a |
128 $ hg add a | 128 $ hg add a |
129 $ hg qnew -d '0 0' -f git | 129 $ hg qnew -d '0 0' -f git |
130 | 130 |
131 $ cat .hg/patches/git | 131 $ cat .hg/patches/git |
132 # HG changeset patch | 132 # HG changeset patch |
133 # Parent 0000000000000000000000000000000000000000 | 133 # Date 0 0 |
134 # Date 0 0 | 134 # Parent 0000000000000000000000000000000000000000 |
135 | 135 |
136 diff --git a/a b/a | 136 diff --git a/a b/a |
137 new file mode 100644 | 137 new file mode 100644 |
138 --- /dev/null | 138 --- /dev/null |
139 +++ b/a | 139 +++ b/a |
145 $ echo a >> a | 145 $ echo a >> a |
146 $ hg qrefresh -d '0 0' | 146 $ hg qrefresh -d '0 0' |
147 | 147 |
148 $ cat .hg/patches/git | 148 $ cat .hg/patches/git |
149 # HG changeset patch | 149 # HG changeset patch |
150 # Parent 0000000000000000000000000000000000000000 | 150 # Date 0 0 |
151 # Date 0 0 | 151 # Parent 0000000000000000000000000000000000000000 |
152 | 152 |
153 diff --git a/a b/a | 153 diff --git a/a b/a |
154 new file mode 100644 | 154 new file mode 100644 |
155 --- /dev/null | 155 --- /dev/null |
156 +++ b/a | 156 +++ b/a |
174 $ hg cp a b | 174 $ hg cp a b |
175 $ hg qnew -d '0 0' -f regular | 175 $ hg qnew -d '0 0' -f regular |
176 | 176 |
177 $ cat .hg/patches/regular | 177 $ cat .hg/patches/regular |
178 # HG changeset patch | 178 # HG changeset patch |
179 # Date 0 0 | |
179 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | 180 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
180 # Date 0 0 | |
181 | 181 |
182 diff -r ef8dafc9fa4c -r a70404f79ba3 b | 182 diff -r ef8dafc9fa4c -r a70404f79ba3 b |
183 --- /dev/null | 183 --- /dev/null |
184 +++ b/b | 184 +++ b/b |
185 @@ -0,0 +1,1 @@ | 185 @@ -0,0 +1,1 @@ |
190 $ hg cp a c | 190 $ hg cp a c |
191 $ hg qrefresh -d '0 0' | 191 $ hg qrefresh -d '0 0' |
192 | 192 |
193 $ cat .hg/patches/regular | 193 $ cat .hg/patches/regular |
194 # HG changeset patch | 194 # HG changeset patch |
195 # Date 0 0 | |
195 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | 196 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
196 # Date 0 0 | |
197 | 197 |
198 diff -r ef8dafc9fa4c b | 198 diff -r ef8dafc9fa4c b |
199 --- /dev/null | 199 --- /dev/null |
200 +++ b/b | 200 +++ b/b |
201 @@ -0,0 +1,1 @@ | 201 @@ -0,0 +1,1 @@ |