From cc0a22847ddcdcc9e86e1224d5b213d9e5fa7dff Mon Sep 17 00:00:00 2001 From: David Lovemore Date: Mon, 28 Apr 2014 15:30:37 +0100 Subject: [PATCH] Allow branching from custom/*/main. Copied from Perforce Change: 185845 ServerID: perforce.ravenbrook.com --- mps/tool/branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mps/tool/branch b/mps/tool/branch index 790dceb0eba..db54da83ce1 100755 --- a/mps/tool/branch +++ b/mps/tool/branch @@ -154,7 +154,7 @@ def main(argv): m = re.match(CHILD_RE, args.child) if not m: raise Error(fmt("Invalid child: {child}")) - if args.customer != m.group(3): + if not args.task and args.customer != m.group(3): raise Error(fmt("Customer mismatch between {parent} and {child}.")) args.date, args.task, _, args.version = m.groups()