Mercurial > hg

diff tests/test-commit-amend.t @ 25295:701df761aa94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: don't warn about branches if repository has multiple branches already This warning exists to prevent git users from prematurely polluting their namespace when trying out Mercurial. But for repos that already have multiple branches, understanding what branches are is not optional so we should just shut up.
author Matt Mackall <mpm@selenic.com>
date Fri, 22 May 2015 17:08:59 -0500
parents 1ef96a3b8b89
children 6084926366b9
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Tue May 19 13:08:21 2015 -0700
+++ b/tests/test-commit-amend.t	Fri May 22 17:08:59 2015 -0500
@@ -373,7 +373,6 @@
   $ hg ci -m 'branch foo'
   $ hg branch default -f
   marked working directory as branch default
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci --amend -m 'back to default'
   saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-fd962fef-amend-backup.hg (glob)
   $ hg branches
@@ -848,7 +847,6 @@
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
-  (branches are permanent and global, did you want a bookmark?)
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m..
@@ -860,7 +858,6 @@
 
   $ hg branch silliness
   marked working directory as branch silliness
-  (branches are permanent and global, did you want a bookmark?)
   $ echo b >> b
   $ hg ci --close-branch -m'open and close'
   abort: can only close branch heads