Mercurial > hg-stable
changeset 19184:05390cfe678a
merge with stable
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Mon, 13 May 2013 13:02:01 -0500 |
| parents | fae47ecaa952 (current diff) 9d88916fb56f (diff) |
| children | f7eff455da03 |
| files | mercurial/commands.py |
| diffstat | 3 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 ======
--- 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