##// END OF EJS Templates
test-rebase-parameters: more tests for revset/opts...
Patrick Mezard -
r16550:0d494a38 stable
parent child Browse files
Show More
@@ -73,6 +73,13 b' These fail:'
73 abort: cannot specify both a source and a base
73 abort: cannot specify both a source and a base
74 [255]
74 [255]
75
75
76 $ hg rebase --rev 5 --source 4
77 abort: cannot specify both a revision and a source
78 [255]
79 $ hg rebase --base 5 --rev 4
80 abort: cannot specify both a revision and a base
81 [255]
82
76 $ hg rebase
83 $ hg rebase
77 nothing to rebase
84 nothing to rebase
78 [1]
85 [1]
@@ -186,7 +193,7 b' Specify only source (from 2 onto 8):'
186 $ hg clone -q -u . a a4
193 $ hg clone -q -u . a a4
187 $ cd a4
194 $ cd a4
188
195
189 $ hg rebase --source 2
196 $ hg rebase --source 'desc("C")'
190 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
197 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
191
198
192 $ hg tglog
199 $ hg tglog
@@ -246,7 +253,7 b' Specify only base (from 1 onto 8):'
246 $ hg clone -q -u . a a6
253 $ hg clone -q -u . a a6
247 $ cd a6
254 $ cd a6
248
255
249 $ hg rebase --base 3
256 $ hg rebase --base 'desc("D")'
250 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
257 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
251
258
252 $ hg tglog
259 $ hg tglog
@@ -330,6 +337,36 b' Specify base and dest (from 1 onto 7):'
330
337
331 $ cd ..
338 $ cd ..
332
339
340
341 Specify only revs (from 2 onto 8)
342
343 $ hg clone -q -u . a a9
344 $ cd a9
345
346 $ hg rebase --rev 'desc("C")::'
347 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob)
348
349 $ hg tglog
350 @ 8: 'D'
351 |
352 o 7: 'C'
353 |\
354 | o 6: 'I'
355 | |
356 | o 5: 'H'
357 | |
358 | | o 4: 'G'
359 | |/|
360 | o | 3: 'F'
361 | | |
362 | | o 2: 'E'
363 | |/
364 o | 1: 'B'
365 |/
366 o 0: 'A'
367
368 $ cd ..
369
333 Test --tool parameter:
370 Test --tool parameter:
334
371
335 $ hg init b
372 $ hg init b
General Comments 0
You need to be logged in to leave comments. Login now