You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "Adrien Ragot (JIRA)" <ji...@codehaus.org> on 2012/01/23 02:05:02 UTC

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Adrien Ragot created MRELEASE-728:
-------------------------------------

             Summary: The commit message for release:branch is wrong
                 Key: MRELEASE-728
                 URL: https://jira.codehaus.org/browse/MRELEASE-728
             Project: Maven 2.x Release Plugin
          Issue Type: Bug
    Affects Versions: 2.2.1
         Environment: git 1.7.5.4
            Reporter: Adrien Ragot


Using Git, when you do mvn release:branch -DbranchName=xxx,
the commit message for master is "[maven-release-plugin] prepare release xxx".

The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Posted by "Joseph Walton (JIRA)" <ji...@codehaus.org>.
    [ https://jira.codehaus.org/browse/MRELEASE-728?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=301117#comment-301117 ] 

Joseph Walton commented on MRELEASE-728:
----------------------------------------

This is fixed by [r1326398|https://svn.apache.org/viewvc?view=revision&revision=1326398], for MRELEASE-745, in 2.3.
                
> The commit message for release:branch is wrong
> ----------------------------------------------
>
>                 Key: MRELEASE-728
>                 URL: https://jira.codehaus.org/browse/MRELEASE-728
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch, Git
>    Affects Versions: 2.2.1
>         Environment: git 1.7.5.4
>            Reporter: Adrien Ragot
>
> Using Git, when you do mvn release:branch -DbranchName=xxx,
> the commit message for master is "[maven-release-plugin] prepare release xxx".
> The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Posted by "Joseph Walton (JIRA)" <ji...@codehaus.org>.
    [ https://jira.codehaus.org/browse/MRELEASE-728?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=289107#comment-289107 ] 

Joseph Walton commented on MRELEASE-728:
----------------------------------------

It looks like svn uses 'prepare for next development iteration' for the commit that bumps the trunk version; git refers to it as a release.
                
> The commit message for release:branch is wrong
> ----------------------------------------------
>
>                 Key: MRELEASE-728
>                 URL: https://jira.codehaus.org/browse/MRELEASE-728
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>    Affects Versions: 2.2.1
>         Environment: git 1.7.5.4
>            Reporter: Adrien Ragot
>
> Using Git, when you do mvn release:branch -DbranchName=xxx,
> the commit message for master is "[maven-release-plugin] prepare release xxx".
> The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Posted by "Joseph Walton (JIRA)" <ji...@codehaus.org>.
    [ https://jira.codehaus.org/browse/MRELEASE-728?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=302156#comment-302156 ] 

Joseph Walton commented on MRELEASE-728:
----------------------------------------

You're right, the current behaviour doesn't match the original report exactly, but I think it's correct.

By default, there is no commit in the new branch - it keeps the same version as the original branch. The commit message in the original branch is:

{noformat}
[maven-release-plugin] prepare for next development iteration
{noformat}

Which is what you want in a branch-for-release workflow. If you use {{updateBranchVersions}} then you end up with:

||commit||branch||commit message||
|3|master|[maven-release-plugin] prepare for next development iteration|
|2|new-branch|[maven-release-plugin] prepare branch new-branch|
|1| |[maven-release-plugin] prepare for next development iteration|

The unnecessary commit in master is due to MRELEASE-729, but I think the messages are fine. 

                
> The commit message for release:branch is wrong
> ----------------------------------------------
>
>                 Key: MRELEASE-728
>                 URL: https://jira.codehaus.org/browse/MRELEASE-728
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch, Git
>    Affects Versions: 2.2.1
>         Environment: git 1.7.5.4
>            Reporter: Adrien Ragot
>            Assignee: Robert Scholte
>             Fix For: 2.3
>
>
> Using Git, when you do mvn release:branch -DbranchName=xxx,
> the commit message for master is "[maven-release-plugin] prepare release xxx".
> The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Posted by "Grégory Joseph (JIRA)" <ji...@codehaus.org>.
    [ https://jira.codehaus.org/browse/MRELEASE-728?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=302063#comment-302063 ] 

Grégory Joseph commented on MRELEASE-728:
-----------------------------------------

Granted, I don't know much about the intricacies of the plugin, but @joewalton, could you summarize how that change affects the commit message which is used ? The one used by SVN as per your previous comment isn't exactly correct either - or at least it's not what the reported was wishing for, i.e a message that clearly states this is a *new branch*.
                
> The commit message for release:branch is wrong
> ----------------------------------------------
>
>                 Key: MRELEASE-728
>                 URL: https://jira.codehaus.org/browse/MRELEASE-728
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch, Git
>    Affects Versions: 2.2.1
>         Environment: git 1.7.5.4
>            Reporter: Adrien Ragot
>            Assignee: Robert Scholte
>             Fix For: 2.3
>
>
> Using Git, when you do mvn release:branch -DbranchName=xxx,
> the commit message for master is "[maven-release-plugin] prepare release xxx".
> The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

       

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Posted by "Robert Scholte (JIRA)" <ji...@codehaus.org>.
     [ https://jira.codehaus.org/browse/MRELEASE-728?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Robert Scholte updated MRELEASE-728:
------------------------------------

    Component/s: Git
                 branch
    
> The commit message for release:branch is wrong
> ----------------------------------------------
>
>                 Key: MRELEASE-728
>                 URL: https://jira.codehaus.org/browse/MRELEASE-728
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch, Git
>    Affects Versions: 2.2.1
>         Environment: git 1.7.5.4
>            Reporter: Adrien Ragot
>
> Using Git, when you do mvn release:branch -DbranchName=xxx,
> the commit message for master is "[maven-release-plugin] prepare release xxx".
> The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[jira] (MRELEASE-728) The commit message for release:branch is wrong

Posted by "Robert Scholte (JIRA)" <ji...@codehaus.org>.
     [ https://jira.codehaus.org/browse/MRELEASE-728?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Robert Scholte closed MRELEASE-728.
-----------------------------------

       Resolution: Fixed
    Fix Version/s: 2.3
         Assignee: Robert Scholte
    
> The commit message for release:branch is wrong
> ----------------------------------------------
>
>                 Key: MRELEASE-728
>                 URL: https://jira.codehaus.org/browse/MRELEASE-728
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch, Git
>    Affects Versions: 2.2.1
>         Environment: git 1.7.5.4
>            Reporter: Adrien Ragot
>            Assignee: Robert Scholte
>             Fix For: 2.3
>
>
> Using Git, when you do mvn release:branch -DbranchName=xxx,
> the commit message for master is "[maven-release-plugin] prepare release xxx".
> The right commit message should be "[maven-release-plugin] prepare branch xxx", like for Svn.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira