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-convert-clonebranches.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.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-convert-clonebranches.t')
| -rw-r--r-- | tests/test-convert-clonebranches.t | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/test-convert-clonebranches.t b/tests/test-convert-clonebranches.t index 6a297ef..fa27e73 100644 --- a/tests/test-convert-clonebranches.t +++ b/tests/test-convert-clonebranches.t @@ -15,7 +15,6 @@ Add a merge with one parent in the same branch $ hg up -qC 0 $ hg branch branch0 marked working directory as branch branch0 - (branches are permanent and global, did you want a bookmark?) $ echo b > b $ hg ci -qAm addb $ hg up -qC @@ -53,13 +52,11 @@ Add a merge with both parents and child in different branches $ cd source $ hg branch branch1 marked working directory as branch branch1 - (branches are permanent and global, did you want a bookmark?) $ echo a > file1 $ hg ci -qAm c1 $ hg up -qC mergeab $ hg branch branch2 marked working directory as branch branch2 - (branches are permanent and global, did you want a bookmark?) $ echo a > file2 $ hg ci -qAm c2 $ hg merge branch1 @@ -67,7 +64,6 @@ Add a merge with both parents and child in different branches (branch merge, don't forget to commit) $ hg branch branch3 marked working directory as branch branch3 - (branches are permanent and global, did you want a bookmark?) $ hg ci -qAm c3 $ cd .. |