Show More
@@ -205,7 +205,7 b' Abort the graft and try committing:' | |||||
205 | $ echo c >> e |
|
205 | $ echo c >> e | |
206 | $ hg ci -mtest |
|
206 | $ hg ci -mtest | |
207 |
|
207 | |||
208 |
$ hg strip . --config extensions. |
|
208 | $ hg strip . --config extensions.strip= | |
209 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
209 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
210 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
|
210 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
211 |
|
211 | |||
@@ -705,7 +705,7 b' but do some destructive editing of the r' | |||||
705 |
|
705 | |||
706 | $ hg up -qC 7 |
|
706 | $ hg up -qC 7 | |
707 | $ hg tag -l -r 13 tmp |
|
707 | $ hg tag -l -r 13 tmp | |
708 |
$ hg --config extensions. |
|
708 | $ hg --config extensions.strip= strip 2 | |
709 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob) |
|
709 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob) | |
710 | $ hg graft tmp |
|
710 | $ hg graft tmp | |
711 | skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f) |
|
711 | skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f) |
General Comments 0
You need to be logged in to leave comments.
Login now