You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "Lars Corneliussen (JIRA)" <ji...@codehaus.org> on 2010/08/09 13:56:33 UTC

[jira] Updated: (MRELEASE-458) Branch Does Not Honor updateWorkingCopyVersions Setting

     [ http://jira.codehaus.org/browse/MRELEASE-458?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Lars Corneliussen updated MRELEASE-458:
---------------------------------------

    Attachment: MRELEASE-458-dont-change-workingcopy.patch

Based on r983489 in https://svn.apache.org/repos/asf/maven/release/trunk

This fixes the original bug and adds the parameter (suppressCommitBeforeTag or suppressCommitBeforeBranch) that ensures no changes are made to the working copy at all.

I had to split the ScmCommitPhase (was used twice) into two separate phases. One for the preparation (before a tag or branch is created) and one for "cleanup" (after tag or branch was created) in order to avoid rolling back something that hasn't happend :-)

Online Diff Viewer: http://github.com/lcorneliussen/maven-release/compare/473197249e1caf39ee2cee6d0efc8a288c30d0c3...c9fc0baef2f52153040241cbc7c561dd87b9e97e

h4. Included commits:
- [MRELEASE-458] Working copy can now be protected from any commits in goals 'branch' and 'prepare' by using 'suppressCommitBeforeTag/Branch' (by Lars Corneliussen<me...@lcorneliussen.de> on 06.05.2010 15:26:51)
- [MRELEASE-458] *Branch Does Not Honor updateWorkingCopyVersions Setting* - ScmCommitPhase now doesn't commit changes on the working copy for branches, where updateWorkingCopyVersions and remoteTagging are set to false. (by Lars Corneliussen<me...@lcorneliussen.de> on 05.05.2010 15:33:09)

Created from http://lcorneliussen.de/utils/git-svn/github.com/lcorneliussen/maven-release/tree/MRELEASE-458-dont-change-workingcopy

> Branch Does Not Honor updateWorkingCopyVersions Setting
> -------------------------------------------------------
>
>                 Key: MRELEASE-458
>                 URL: http://jira.codehaus.org/browse/MRELEASE-458
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch
>    Affects Versions: 2.0-beta-7, 2.0-beta-9
>            Reporter: James Carman
>             Fix For: 2.1
>
>         Attachments: MRELEASE-458-dont-change-workingcopy.patch, MRELEASE-458-test.diff
>
>
> I copied the following command line from the documentation site (http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html):
> mvn release:branch -DbranchName=my-branch -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false
> I have used this method in the past to cut a milestone release from our trunk.  However, it seems that the working copy is actually being modified now.  Has there been a newer release or something?

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira