##// END OF EJS Templates
strip apostrophes from an error messages
Dirkjan Ochtman -
r10371:eacfff11 default
parent child Browse files
Show More
@@ -1564,7 +1564,7 b' class localrepository(repo.repository):'
1564
1564
1565 newbranches = list(set(localbrheads) - set(remotebrheads))
1565 newbranches = list(set(localbrheads) - set(remotebrheads))
1566 if newbranches: # new branch requires --force
1566 if newbranches: # new branch requires --force
1567 branchnames = ', '.join("'%s'" % b for b in newbranches)
1567 branchnames = ', '.join("%s" % b for b in newbranches)
1568 self.ui.warn(_("abort: push creates "
1568 self.ui.warn(_("abort: push creates "
1569 "new remote branches: %s!\n")
1569 "new remote branches: %s!\n")
1570 % branchnames)
1570 % branchnames)
@@ -84,23 +84,23 b' 0'
84 % push on existing branch and new branch
84 % push on existing branch and new branch
85 pushing to ../f
85 pushing to ../f
86 searching for changes
86 searching for changes
87 abort: push creates new remote branches: 'c'!
87 abort: push creates new remote branches: c!
88 (use 'hg push -f' to force)
88 (use 'hg push -f' to force)
89 1
89 1
90 pushing to ../f
90 pushing to ../f
91 searching for changes
91 searching for changes
92 abort: push creates new remote branches: 'c'!
92 abort: push creates new remote branches: c!
93 (use 'hg push -f' to force)
93 (use 'hg push -f' to force)
94 1
94 1
95 % multiple new branches
95 % multiple new branches
96 pushing to ../f
96 pushing to ../f
97 searching for changes
97 searching for changes
98 abort: push creates new remote branches: 'c', 'd'!
98 abort: push creates new remote branches: c, d!
99 (use 'hg push -f' to force)
99 (use 'hg push -f' to force)
100 1
100 1
101 pushing to ../f
101 pushing to ../f
102 searching for changes
102 searching for changes
103 abort: push creates new remote branches: 'd'!
103 abort: push creates new remote branches: d!
104 (use 'hg push -f' to force)
104 (use 'hg push -f' to force)
105 1
105 1
106 % fail on multiple head push
106 % fail on multiple head push
General Comments 0
You need to be logged in to leave comments. Login now