[
http://jira.codehaus.org/browse/CONTINUUM-2591?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=246094#action_246094
]
Brent N Atkinson commented on CONTINUUM-2591:
---------------------------------------------
Brett, my apologies. A portion of the issue was solved by updating the
maven-scm providers to 1.4 (so it should be right in trunk too). However,
updating the working copy during release still didn't work right. During the
working copy update phase the maven-scm update() call isn't passed the proper
ScmVersion for the current working copy. It always is called with null. The git
scm provider assumes that means you want to pull changes from master rather
than the working copy's active branch (which seems rather odd to me, but I
stepped around it). It essentially does a merge of two (possibly unrelated)
branches.
I should have made it more clear that the patch was only meant to illustrate
the issue and is a crude workaround and not a complete fix. I fully expected
that someone with more understanding of this process could improve it greatly.
I based it on 1.3.6 because it is the non-beta release and it can get users
around the problem. Next time, I'll submit a patch for trunk *and* the current
non-beta release. Would that work?
> Git based maven2 builds can't properly release or checkout on branch
> --------------------------------------------------------------------
>
> Key: CONTINUUM-2591
> URL: http://jira.codehaus.org/browse/CONTINUUM-2591
> Project: Continuum
> Issue Type: Bug
> Components: Release
> Affects Versions: 1.3.6
> Reporter: Brent N Atkinson
> Priority: Critical
> Attachments: CONTINUUM-2591-trunk.patch, CONTINUUM-2591.patch
>
>
> It is not possible to add or release a maven2 project using the git scm when
> the project is on a branch. There appears to be multiple reasons for this:
> * The maven-scm version bundled with continuum is old and doesn't include git
> providers with sufficiently complete git support.
> * Git SCM URLs don't include sufficient information to identify the branch.
> * Continuum-release's UpdateWorkingCopyPhase doesn't properly update the
> working (it always uses master rather than the current branch)
--
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
