Mercurial > hg
comparison tests/test-strip.t @ 20117:aa9385f983fa
tests: don't load unnecessary graphlog extension
Since graphlog is in core, we can use 'hg log -G' instead.
| author | Martin Geisler <martin@geisler.net> |
|---|---|
| date | Fri, 22 Nov 2013 19:14:17 +0100 |
| parents | d51c4d85ec23 |
| children | f49d60fa40a5 |
comparison
equal
deleted
inserted
replaced
| 20116:9e0219967e38 | 20117:aa9385f983fa |
|---|---|
| 1 $ echo "[extensions]" >> $HGRCPATH | 1 $ echo "[extensions]" >> $HGRCPATH |
| 2 $ echo "strip=" >> $HGRCPATH | 2 $ echo "strip=" >> $HGRCPATH |
| 3 $ echo "graphlog=" >> $HGRCPATH | |
| 4 | 3 |
| 5 $ restore() { | 4 $ restore() { |
| 6 > hg unbundle -q .hg/strip-backup/* | 5 > hg unbundle -q .hg/strip-backup/* |
| 7 > rm .hg/strip-backup/* | 6 > rm .hg/strip-backup/* |
| 8 > } | 7 > } |
| 224 | 223 |
| 225 $ restore | 224 $ restore |
| 226 | 225 |
| 227 $ hg up | 226 $ hg up |
| 228 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 229 $ hg glog | 228 $ hg log -G |
| 230 @ changeset: 4:264128213d29 | 229 @ changeset: 4:264128213d29 |
| 231 | tag: tip | 230 | tag: tip |
| 232 | parent: 1:ef3a871183d7 | 231 | parent: 1:ef3a871183d7 |
| 233 | user: test | 232 | user: test |
| 234 | date: Thu Jan 01 00:00:00 1970 +0000 | 233 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 257 | 256 |
| 258 2 is parent of 3, only one strip should happen | 257 2 is parent of 3, only one strip should happen |
| 259 | 258 |
| 260 $ hg strip "roots(2)" 3 | 259 $ hg strip "roots(2)" 3 |
| 261 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | 260 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
| 262 $ hg glog | 261 $ hg log -G |
| 263 @ changeset: 2:264128213d29 | 262 @ changeset: 2:264128213d29 |
| 264 | tag: tip | 263 | tag: tip |
| 265 | user: test | 264 | user: test |
| 266 | date: Thu Jan 01 00:00:00 1970 +0000 | 265 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 267 | summary: c | 266 | summary: c |
| 275 user: test | 274 user: test |
| 276 date: Thu Jan 01 00:00:00 1970 +0000 | 275 date: Thu Jan 01 00:00:00 1970 +0000 |
| 277 summary: a | 276 summary: a |
| 278 | 277 |
| 279 $ restore | 278 $ restore |
| 280 $ hg glog | 279 $ hg log -G |
| 281 o changeset: 4:443431ffac4f | 280 o changeset: 4:443431ffac4f |
| 282 | tag: tip | 281 | tag: tip |
| 283 | user: test | 282 | user: test |
| 284 | date: Thu Jan 01 00:00:00 1970 +0000 | 283 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 285 | summary: e | 284 | summary: e |
| 309 2 different branches: 2 strips | 308 2 different branches: 2 strips |
| 310 | 309 |
| 311 $ hg strip 2 4 | 310 $ hg strip 2 4 |
| 312 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | 312 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
| 314 $ hg glog | 313 $ hg log -G |
| 315 o changeset: 2:65bd5f99a4a3 | 314 o changeset: 2:65bd5f99a4a3 |
| 316 | tag: tip | 315 | tag: tip |
| 317 | user: test | 316 | user: test |
| 318 | date: Thu Jan 01 00:00:00 1970 +0000 | 317 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 319 | summary: d | 318 | summary: d |