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-commit-multiple.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-commit-multiple.t')
| -rw-r--r-- | tests/test-commit-multiple.t | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/test-commit-multiple.t b/tests/test-commit-multiple.t index 3337b76..a7dcc90 100644 --- a/tests/test-commit-multiple.t +++ b/tests/test-commit-multiple.t @@ -31,7 +31,6 @@ add initial changesets commit bug fixes on bug fix branch $ hg branch fixes marked working directory as branch fixes - (branches are permanent and global, did you want a bookmark?) $ echo fix1 > bugfix $ echo fix1 >> file1 $ hg ci -Am"fix 1" @@ -53,7 +52,6 @@ transplant bug fixes onto release branch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg branch release marked working directory as branch release - (branches are permanent and global, did you want a bookmark?) $ hg transplant 2 3 applying [0-9a-f]{12} (re) [0-9a-f]{12} transplanted to [0-9a-f]{12} (re) @@ -129,5 +127,3 @@ Do a size-preserving modification outside of that process 5 fix 2 bugfix file1 6 x bugfix file1 7 y file1 - - $ cd .. |