# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1368468121 18000
# Node ID 05390cfe678ac585b809662c048ee896a1235f10
# Parent  fae47ecaa952999bd8ae82ec9585575d1afdc2fb# Parent  9d88916fb56f2974717f0856caf907ef41ec66c3
merge with stable

diff -r fae47ecaa952 -r 05390cfe678a mercurial/commands.py
--- a/mercurial/commands.py	Sat May 11 20:25:15 2013 -0500
+++ b/mercurial/commands.py	Mon May 13 13:02:01 2013 -0500
@@ -955,6 +955,9 @@
 
     Returns 0 on success.
     """
+    if label:
+        label = label.strip()
+
     if not opts.get('clean') and not label:
         ui.write("%s\n" % repo.dirstate.branch())
         return
diff -r fae47ecaa952 -r 05390cfe678a mercurial/help/config.txt
--- a/mercurial/help/config.txt	Sat May 11 20:25:15 2013 -0500
+++ b/mercurial/help/config.txt	Mon May 13 13:02:01 2013 -0500
@@ -85,6 +85,9 @@
     be read.  Mercurial checks each of these locations in the specified
     order until one or more configuration files are detected.
 
+.. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
+   is used when running 32-bit Python on 64-bit Windows.
+
 Syntax
 ======
 
diff -r fae47ecaa952 -r 05390cfe678a tests/test-branches.t
--- a/tests/test-branches.t	Sat May 11 20:25:15 2013 -0500
+++ b/tests/test-branches.t	Mon May 13 13:02:01 2013 -0500
@@ -68,6 +68,18 @@
   abort: '\n' cannot be used in a name
   [255]
 
+trailing or leading spaces should be stripped before testing duplicates
+
+  $ hg branch 'b '
+  abort: a branch of the same name already exists
+  (use 'hg update' to switch to it)
+  [255]
+
+  $ hg branch ' b'
+  abort: a branch of the same name already exists
+  (use 'hg update' to switch to it)
+  [255]
+
 verify update will accept invalid legacy branch names
 
   $ hg init test-invalid-branch-name