--- a/mercurial/HGCommitTask.st Mon Dec 10 03:43:12 2012 +0000
+++ b/mercurial/HGCommitTask.st Mon Dec 10 03:49:41 2012 +0000
@@ -51,10 +51,12 @@
"Actually commit the changes, To be overridden by subclasses"
self synchronized:[
- | wc |
+ | wc createBranch |
wc := self package temporaryWorkingCopy.
- branch notNil ifTrue:[
+ createBranch := branch notNil and:[branch ~= wc branch name].
+
+ createBranch ifTrue:[
(self package repository branches contains:[:b|b name = branch]) ifTrue:[
HGCommitError raiseErrorString: 'Commiting to an existing branch is not allowed'.
^self.
@@ -68,14 +70,14 @@
].
"/Also, mark original (package) working copy as given branch
"/so subsequent 'hg update' will update from that branch
- branch notNil ifTrue:[
+ createBranch ifTrue:[
wc repository workingCopy branch: branch.
].
].
"Created: / 15-11-2012 / 16:52:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-12-2012 / 16:13:16 / jv"
- "Modified: / 10-12-2012 / 03:32:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 10-12-2012 / 03:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doPrepareWorkingCopy2