diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-mq-strip.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-mq-strip.t')
| -rw-r--r-- | tests/test-mq-strip.t | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/tests/test-mq-strip.t b/tests/test-mq-strip.t index 70fffb1..a854e31 100644 --- a/tests/test-mq-strip.t +++ b/tests/test-mq-strip.t @@ -311,6 +311,7 @@ after strip of merge parent $ hg strip 2 4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) + saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) $ hg glog @ changeset: 2:65bd5f99a4a3 | tag: tip @@ -420,49 +421,3 @@ Verify strip protects against stripping wc parent when there are uncommited mods $ hg status M bar ? b - $ cd .. - -stripping many nodes on a complex graph (issue3299) - - $ hg init issue3299 - $ cd issue3299 - $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' - $ hg strip 'not ancestors(x)' - saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) - -test hg strip -B bookmark - - $ cd .. - $ hg init bookmarks - $ cd bookmarks - $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b' - $ hg bookmark -r 'a' 'todelete' - $ hg bookmark -r 'b' 'B' - $ hg bookmark -r 'b' 'nostrip' - $ hg bookmark -r 'c' 'delete' - $ hg up -C todelete - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg strip -B nostrip - bookmark 'nostrip' deleted - abort: empty revision set - [255] - $ hg strip -B todelete - bookmark 'todelete' deleted - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) - $ hg id -ir dcbb326fdec2 - abort: unknown revision 'dcbb326fdec2'! - [255] - $ hg id -ir d62d843c9a01 - d62d843c9a01 - $ hg bookmarks - B 9:ff43616e5d0f - delete 6:2702dd0c91e7 - $ hg strip -B delete - bookmark 'delete' deleted - saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob) - $ hg id -ir 6:2702dd0c91e7 - abort: unknown revision '2702dd0c91e7'! - [255] - - $ cd .. |