Mercurial > public > mercurial-scm > hg-stable

diff tests/test-newbranch @ 4410:bbc97d419b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add fast-forward branch merging
author Brendan Cully <brendan@kublai.com>
date Sun, 06 May 2007 20:27:45 -0700
parents 0d51eb296fb9
children ee317dbfb9d0
line wrap: on
line diff
--- a/tests/test-newbranch	Mon May 07 00:12:35 2007 +0200
+++ b/tests/test-newbranch	Sun May 06 20:27:45 2007 -0700
@@ -51,4 +51,15 @@
 hg branch foobar
 hg up
 
+echo % fastforward merge
+hg branch ff
+echo ff > ff
+hg ci -Am'fast forward' -d '1000000 0'
+hg up foo
+hg merge ff
+hg branch
+hg commit -m'Merge ff into foo' -d '1000000 0'
+hg parents
+hg manifest
+
 exit 0