Mercurial > hg

comparison tests/test-rebase-parameters.t @ 14122:e83567686d66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: change test-rebase-parameters to use bundle/rebase.hg
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 30 Apr 2011 17:38:06 +0200
parents 0995eee8ffe4
children 7d1b637738a3
comparison
equal deleted inserted replaced
14121:012c719103ab 14122:e83567686d66
8 > EOF 8 > EOF
9 9
10 10
11 $ hg init a 11 $ hg init a
12 $ cd a 12 $ cd a
13 13 $ hg unbundle $TESTDIR/bundles/rebase.hg
14 $ echo c1 > c1 14 adding changesets
15 $ hg ci -Am c1 15 adding manifests
16 adding c1 16 adding file changes
17 17 added 8 changesets with 7 changes to 7 files (+2 heads)
18 $ echo c2 > c2 18 (run 'hg heads' to see heads, 'hg merge' to merge)
19 $ hg ci -Am c2 19 $ hg up tip
20 adding c2 20 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
21 21
22 $ echo c3 > c3 22 $ echo I > I
23 $ hg ci -Am c3 23 $ hg ci -AmI
24 adding c3 24 adding I
25 25
26 $ hg up -q -C 1 26 $ hg tglog
27 27 @ 8: 'I'
28 $ echo l1 > l1 28 |
29 $ hg ci -Am l1 29 o 7: 'H'
30 adding l1 30 |
31 created new head 31 | o 6: 'G'
32 32 |/|
33 $ echo l2 > l2 33 o | 5: 'F'
34 $ hg ci -Am l2 34 | |
35 adding l2 35 | o 4: 'E'
36 36 |/
37 $ echo l3 > l3 37 | o 3: 'D'
38 $ hg ci -Am l3 38 | |
39 adding l3 39 | o 2: 'C'
40 40 | |
41 $ hg up -q -C 2 41 | o 1: 'B'
42 42 |/
43 $ echo r1 > r1 43 o 0: 'A'
44 $ hg ci -Am r1
45 adding r1
46
47 $ echo r2 > r2
48 $ hg ci -Am r2
49 adding r2
50
51 $ hg tglog
52 @ 7: 'r2'
53 |
54 o 6: 'r1'
55 |
56 | o 5: 'l3'
57 | |
58 | o 4: 'l2'
59 | |
60 | o 3: 'l1'
61 | |
62 o | 2: 'c3'
63 |/
64 o 1: 'c2'
65 |
66 o 0: 'c1'
67 44
68 $ cd .. 45 $ cd ..
69 46
70 47
71 These fail: 48 These fail:
91 68
92 $ hg rebase 69 $ hg rebase
93 nothing to rebase 70 nothing to rebase
94 [1] 71 [1]
95 72
96 $ hg up -q 6 73 $ hg up -q 7
97 74
98 $ hg rebase 75 $ hg rebase
99 nothing to rebase 76 nothing to rebase
100 [1] 77 [1]
101 78
102 79
103 These work: 80 These work:
104 81
105 Rebase with no arguments (from 3 onto 7): 82 Rebase with no arguments (from 3 onto 8):
106 83
107 $ hg up -q -C 5 84 $ hg up -q -C 3
108 85
109 $ hg rebase 86 $ hg rebase
110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) 87 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
111 88
112 $ hg tglog 89 $ hg tglog
113 @ 7: 'l3' 90 @ 8: 'D'
114 | 91 |
115 o 6: 'l2' 92 o 7: 'C'
116 | 93 |
117 o 5: 'l1' 94 o 6: 'B'
118 | 95 |
119 o 4: 'r2' 96 o 5: 'I'
120 | 97 |
121 o 3: 'r1' 98 o 4: 'H'
122 | 99 |
123 o 2: 'c3' 100 | o 3: 'G'
124 | 101 |/|
125 o 1: 'c2' 102 o | 2: 'F'
126 | 103 | |
127 o 0: 'c1' 104 | o 1: 'E'
105 |/
106 o 0: 'A'
128 107
129 Try to rollback after a rebase (fail): 108 Try to rollback after a rebase (fail):
130 109
131 $ hg rollback 110 $ hg rollback
132 no rollback information available 111 no rollback information available
133 [1] 112 [1]
134 113
135 $ cd .. 114 $ cd ..
136 115
137 116
138 Rebase with base == '.' => same as no arguments (from 3 onto 7): 117 Rebase with base == '.' => same as no arguments (from 3 onto 8):
139 118
140 $ hg clone -q -u 5 a a2 119 $ hg clone -q -u 3 a a2
141 $ cd a2 120 $ cd a2
142 121
143 $ hg rebase --base . 122 $ hg rebase --base .
144 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) 123 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
145 124
146 $ hg tglog 125 $ hg tglog
147 @ 7: 'l3' 126 @ 8: 'D'
148 | 127 |
149 o 6: 'l2' 128 o 7: 'C'
150 | 129 |
151 o 5: 'l1' 130 o 6: 'B'
152 | 131 |
153 o 4: 'r2' 132 o 5: 'I'
154 | 133 |
155 o 3: 'r1' 134 o 4: 'H'
156 | 135 |
157 o 2: 'c3' 136 | o 3: 'G'
158 | 137 |/|
159 o 1: 'c2' 138 o | 2: 'F'
160 | 139 | |
161 o 0: 'c1' 140 | o 1: 'E'
162 141 |/
163 $ cd .. 142 o 0: 'A'
164 143
165 144 $ cd ..
166 Rebase with dest == `hg branch` => same as no arguments (from 3 onto 7): 145
167 146
168 $ hg clone -q -u 5 a a3 147 Rebase with dest == `hg branch` => same as no arguments (from 3 onto 8):
148
149 $ hg clone -q -u 3 a a3
169 $ cd a3 150 $ cd a3
170 151
171 $ hg rebase --dest `hg branch` 152 $ hg rebase --dest `hg branch`
172 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) 153 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
173 154
174 $ hg tglog 155 $ hg tglog
175 @ 7: 'l3' 156 @ 8: 'D'
176 | 157 |
177 o 6: 'l2' 158 o 7: 'C'
178 | 159 |
179 o 5: 'l1' 160 o 6: 'B'
180 | 161 |
181 o 4: 'r2' 162 o 5: 'I'
182 | 163 |
183 o 3: 'r1' 164 o 4: 'H'
184 | 165 |
185 o 2: 'c3' 166 | o 3: 'G'
186 | 167 |/|
187 o 1: 'c2' 168 o | 2: 'F'
188 | 169 | |
189 o 0: 'c1' 170 | o 1: 'E'
190 171 |/
191 $ cd .. 172 o 0: 'A'
192 173
193 174 $ cd ..
194 Specify only source (from 4 onto 7): 175
176
177 Specify only source (from 2 onto 8):
195 178
196 $ hg clone -q -u . a a4 179 $ hg clone -q -u . a a4
197 $ cd a4 180 $ cd a4
198 181
199 $ hg rebase --source 4 182 $ hg rebase --source 2
200 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) 183 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
201 184
202 $ hg tglog 185 $ hg tglog
203 @ 7: 'l3' 186 @ 8: 'D'
204 | 187 |
205 o 6: 'l2' 188 o 7: 'C'
206 |\ 189 |\
207 | o 5: 'r2' 190 | o 6: 'I'
208 | | 191 | |
209 | o 4: 'r1' 192 | o 5: 'H'
210 | | 193 | |
211 o | 3: 'l1' 194 | | o 4: 'G'
212 | | 195 | |/|
213 | o 2: 'c3' 196 | o | 3: 'F'
214 |/ 197 | | |
215 o 1: 'c2' 198 | | o 2: 'E'
216 | 199 | |/
217 o 0: 'c1' 200 o | 1: 'B'
201 |/
202 o 0: 'A'
218 203
219 $ cd .. 204 $ cd ..
220 205
221 206
222 Specify only dest (from 3 onto 6): 207 Specify only dest (from 3 onto 6):
223 208
224 $ hg clone -q -u 5 a a5 209 $ hg clone -q -u 3 a a5
225 $ cd a5 210 $ cd a5
226 211
227 $ hg rebase --dest 6 212 $ hg rebase --dest 6
228 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) 213 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
229 214
230 $ hg tglog 215 $ hg tglog
231 @ 7: 'l3' 216 @ 8: 'D'
232 | 217 |
233 o 6: 'l2' 218 o 7: 'C'
234 | 219 |
235 o 5: 'l1' 220 o 6: 'B'
236 | 221 |
237 | o 4: 'r2' 222 | o 5: 'I'
238 |/ 223 | |
239 o 3: 'r1' 224 | o 4: 'H'
240 | 225 | |
241 o 2: 'c3' 226 o | 3: 'G'
242 | 227 |\|
243 o 1: 'c2' 228 | o 2: 'F'
244 | 229 | |
245 o 0: 'c1' 230 o | 1: 'E'
246 231 |/
247 $ cd .. 232 o 0: 'A'
248 233
249 234 $ cd ..
250 Specify only base (from 3 onto 7): 235
236
237 Specify only base (from 1 onto 8):
251 238
252 $ hg clone -q -u . a a6 239 $ hg clone -q -u . a a6
253 $ cd a6 240 $ cd a6
254 241
255 $ hg rebase --base 5 242 $ hg rebase --base 3
256 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) 243 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
257 244
258 $ hg tglog 245 $ hg tglog
259 @ 7: 'l3' 246 @ 8: 'D'
260 | 247 |
261 o 6: 'l2' 248 o 7: 'C'
262 | 249 |
263 o 5: 'l1' 250 o 6: 'B'
264 | 251 |
265 o 4: 'r2' 252 o 5: 'I'
266 | 253 |
267 o 3: 'r1' 254 o 4: 'H'
268 | 255 |
269 o 2: 'c3' 256 | o 3: 'G'
270 | 257 |/|
271 o 1: 'c2' 258 o | 2: 'F'
272 | 259 | |
273 o 0: 'c1' 260 | o 1: 'E'
274 261 |/
275 $ cd .. 262 o 0: 'A'
276 263
277 264 $ cd ..
278 Specify source and dest (from 4 onto 6): 265
266
267 Specify source and dest (from 2 onto 7):
279 268
280 $ hg clone -q -u . a a7 269 $ hg clone -q -u . a a7
281 $ cd a7 270 $ cd a7
282 271
283 $ hg rebase --source 4 --dest 6 272 $ hg rebase --detach --source 2 --dest 7
284 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob) 273 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob)
285 274
286 $ hg tglog 275 $ hg tglog
287 @ 7: 'l3' 276 @ 8: 'D'
288 | 277 |
289 o 6: 'l2' 278 o 7: 'C'
290 |\ 279 |
291 | | o 5: 'r2' 280 | o 6: 'I'
292 | |/ 281 |/
293 | o 4: 'r1' 282 o 5: 'H'
294 | | 283 |
295 o | 3: 'l1' 284 | o 4: 'G'
296 | | 285 |/|
297 | o 2: 'c3' 286 o | 3: 'F'
298 |/ 287 | |
299 o 1: 'c2' 288 | o 2: 'E'
300 | 289 |/
301 o 0: 'c1' 290 | o 1: 'B'
302 291 |/
303 $ cd .. 292 o 0: 'A'
304 293
305 294 $ cd ..
306 Specify base and dest (from 3 onto 6): 295
296
297 Specify base and dest (from 1 onto 7):
307 298
308 $ hg clone -q -u . a a8 299 $ hg clone -q -u . a a8
309 $ cd a8 300 $ cd a8
310 301
311 $ hg rebase --base 4 --dest 6 302 $ hg rebase --base 3 --dest 7
312 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob) 303 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob)
313 304
314 $ hg tglog 305 $ hg tglog
315 @ 7: 'l3' 306 @ 8: 'D'
316 | 307 |
317 o 6: 'l2' 308 o 7: 'C'
318 | 309 |
319 o 5: 'l1' 310 o 6: 'B'
320 | 311 |
321 | o 4: 'r2' 312 | o 5: 'I'
322 |/ 313 |/
323 o 3: 'r1' 314 o 4: 'H'
324 | 315 |
325 o 2: 'c3' 316 | o 3: 'G'
326 | 317 |/|
327 o 1: 'c2' 318 o | 2: 'F'
328 | 319 | |
329 o 0: 'c1' 320 | o 1: 'E'
321 |/
322 o 0: 'A'
330 323
331 $ cd .. 324 $ cd ..
332 325
333 Test --tool parameter: 326 Test --tool parameter:
334 327