Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 19180:12dbdd348bb0 stable
branch: strip whitespace before testing known branch name
Because dirstate._branch() strips leading/trailing spaces from .hg/branch,
"hg branch ' foo '" should abort if branch "foo" exists in another head.
tag command had a similar bug and fixed by 3d0a9c8d7184.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Tue, 07 May 2013 23:49:03 +0900 |
parents | 23f785b38af3 |
children | 05390cfe678a 01d68fb07915 |
comparison
equal
deleted
inserted
replaced
19169:bcdfb6078b9f | 19180:12dbdd348bb0 |
---|---|
941 Use the command :hg:`update` to switch to an existing branch. Use | 941 Use the command :hg:`update` to switch to an existing branch. Use |
942 :hg:`commit --close-branch` to mark this branch as closed. | 942 :hg:`commit --close-branch` to mark this branch as closed. |
943 | 943 |
944 Returns 0 on success. | 944 Returns 0 on success. |
945 """ | 945 """ |
946 if label: | |
947 label = label.strip() | |
948 | |
946 if not opts.get('clean') and not label: | 949 if not opts.get('clean') and not label: |
947 ui.write("%s\n" % repo.dirstate.branch()) | 950 ui.write("%s\n" % repo.dirstate.branch()) |
948 return | 951 return |
949 | 952 |
950 wlock = repo.wlock() | 953 wlock = repo.wlock() |