Mercurial > hg
comparison tests/test-rebase-collapse.t @ 12640:6cc4b14fb76b
tests: remove redundant globs
Many globs now just match $TESTTMP and is no longer needed.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 08 Oct 2010 22:36:10 -0500 |
| parents | 16b854cb80f1 |
| children | ee349e228835 |
comparison
equal
deleted
inserted
replaced
| 12639:236058a65cb4 | 12640:6cc4b14fb76b |
|---|---|
| 75 | 75 |
| 76 $ hg clone -q -u 3 a a1 | 76 $ hg clone -q -u 3 a a1 |
| 77 $ cd a1 | 77 $ cd a1 |
| 78 | 78 |
| 79 $ hg rebase --collapse --keepbranches | 79 $ hg rebase --collapse --keepbranches |
| 80 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | 80 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
| 81 | 81 |
| 82 $ hg tglog | 82 $ hg tglog |
| 83 @ 5: 'Collapsed revision | 83 @ 5: 'Collapsed revision |
| 84 | * B | 84 | * B |
| 85 | * C | 85 | * C |
| 109 | 109 |
| 110 $ hg clone -q -u . a a2 | 110 $ hg clone -q -u . a a2 |
| 111 $ cd a2 | 111 $ cd a2 |
| 112 | 112 |
| 113 $ hg rebase --base 6 --collapse | 113 $ hg rebase --base 6 --collapse |
| 114 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | 114 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
| 115 | 115 |
| 116 $ hg tglog | 116 $ hg tglog |
| 117 @ 6: 'Collapsed revision | 117 @ 6: 'Collapsed revision |
| 118 | * E | 118 | * E |
| 119 | * G' | 119 | * G' |
| 218 [255] | 218 [255] |
| 219 | 219 |
| 220 Rebase and collapse - E onto H: | 220 Rebase and collapse - E onto H: |
| 221 | 221 |
| 222 $ hg rebase -s 4 --collapse | 222 $ hg rebase -s 4 --collapse |
| 223 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | 223 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob) |
| 224 | 224 |
| 225 $ hg tglog | 225 $ hg tglog |
| 226 @ 5: 'Collapsed revision | 226 @ 5: 'Collapsed revision |
| 227 |\ * E | 227 |\ * E |
| 228 | | * F | 228 | | * F |
| 329 $ hg clone -q -u . c c1 | 329 $ hg clone -q -u . c c1 |
| 330 $ cd c1 | 330 $ cd c1 |
| 331 | 331 |
| 332 $ hg rebase -s 4 --collapse | 332 $ hg rebase -s 4 --collapse |
| 333 merging E | 333 merging E |
| 334 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | 334 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob) |
| 335 | 335 |
| 336 $ hg tglog | 336 $ hg tglog |
| 337 @ 5: 'Collapsed revision | 337 @ 5: 'Collapsed revision |
| 338 |\ * E | 338 |\ * E |
| 339 | | * F | 339 | | * F |
| 418 | 418 |
| 419 $ hg clone -q -u . d d1 | 419 $ hg clone -q -u . d d1 |
| 420 $ cd d1 | 420 $ cd d1 |
| 421 | 421 |
| 422 $ hg rebase -s 1 --collapse | 422 $ hg rebase -s 1 --collapse |
| 423 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | 423 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob) |
| 424 | 424 |
| 425 $ hg tglog | 425 $ hg tglog |
| 426 @ 2: 'Collapsed revision | 426 @ 2: 'Collapsed revision |
| 427 | * B | 427 | * B |
| 428 | * C | 428 | * C |