You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@maven.apache.org by "David C. Hicks" <dh...@i-hicks.org> on 2009/07/28 19:00:10 UTC
Help with branching?
Hi gang,
I need to branch from a prior release tag to fix a defect. I thought I
had the right "process," but something is not happy. We do have the
project enabled for the maven-release-plugin. Here are the steps I took:
1) Check code out of SVN from the previous release tag.
2) Using release:branch - mvn -DbranchName=Salient-0.9.22.1
-DupdateBranchVersions=true -DupdateWorkingCopyVersions=false release:branch
3) Enter my version label when prompted "0.9.22.1-SNAPSHOT" (repeat for
each sub-module [i couldn't get autoVersionSubmodules to play nice])
4) Get an error:
svn: Commit failed (details follow):
svn: Source url
'svn://svn.enttek.com/allureglobal/dm/tags/salient-0.9.22' is from
different repository
Now, it's true that the SCM information in the POM gets updated such
that it isn't the same as where the code was checked out from, but that
shouldn't matter, should it? We're not going to modify the original
sources - we're just creating the branch. Right?
Maybe I'm going about this all wrong, but I didn't find much in the way
of documents/blogs/stories on Google - at least, nothing that shed any
light on this for me.
Thanks,
Dave
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Help with branching?
Posted by "David C. Hicks" <dh...@i-hicks.org>.
Well, I figured out what was going on. It's Subversion's error, at
least, partly. I didn't want to set up our continuous integration
environment so that it "knows" what user/password to use for
Subversion. Instead, I put add that user/pw to the settings.xml file
and let Maven include it in the URL. Apparently, Subversion does an
"exact match" on the URL when trying to do a check-in of any kind. So,
because I checked the code out using:
svn co svn://server.enttek.com/...
But Maven only knows to use:
svn copy svn://user:pw@server.enttek.com/...
Subversion can't handle it and throws an error. I assume that when this
happens, the release plugin loses itself and ends up checking the
pom.xml changes back into the "tags" folder instead of "branches".
Maybe someone else will find this information useful in the future.
Dave
David C. Hicks wrote:
> I guess I was wrong...it *did* screw up my tagged code. Now, I have to
> figure out how badly and get that all fixed, too.
>
> Why would the release:branch goal put changes back into the source tree?
>
> David C. Hicks wrote:
>
>> Hi gang,
>>
>> I need to branch from a prior release tag to fix a defect. I thought I
>> had the right "process," but something is not happy. We do have the
>> project enabled for the maven-release-plugin. Here are the steps I took:
>>
>> 1) Check code out of SVN from the previous release tag.
>> 2) Using release:branch - mvn -DbranchName=Salient-0.9.22.1
>> -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false release:branch
>> 3) Enter my version label when prompted "0.9.22.1-SNAPSHOT" (repeat for
>> each sub-module [i couldn't get autoVersionSubmodules to play nice])
>> 4) Get an error:
>>
>> svn: Commit failed (details follow):
>> svn: Source url
>> 'svn://svn.enttek.com/allureglobal/dm/tags/salient-0.9.22' is from
>> different repository
>>
>> Now, it's true that the SCM information in the POM gets updated such
>> that it isn't the same as where the code was checked out from, but that
>> shouldn't matter, should it? We're not going to modify the original
>> sources - we're just creating the branch. Right?
>>
>> Maybe I'm going about this all wrong, but I didn't find much in the way
>> of documents/blogs/stories on Google - at least, nothing that shed any
>> light on this for me.
>>
>> Thanks,
>> Dave
>>
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Help with branching?
Posted by "David C. Hicks" <dh...@i-hicks.org>.
I guess I was wrong...it *did* screw up my tagged code. Now, I have to
figure out how badly and get that all fixed, too.
Why would the release:branch goal put changes back into the source tree?
David C. Hicks wrote:
> Hi gang,
>
> I need to branch from a prior release tag to fix a defect. I thought I
> had the right "process," but something is not happy. We do have the
> project enabled for the maven-release-plugin. Here are the steps I took:
>
> 1) Check code out of SVN from the previous release tag.
> 2) Using release:branch - mvn -DbranchName=Salient-0.9.22.1
> -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false release:branch
> 3) Enter my version label when prompted "0.9.22.1-SNAPSHOT" (repeat for
> each sub-module [i couldn't get autoVersionSubmodules to play nice])
> 4) Get an error:
>
> svn: Commit failed (details follow):
> svn: Source url
> 'svn://svn.enttek.com/allureglobal/dm/tags/salient-0.9.22' is from
> different repository
>
> Now, it's true that the SCM information in the POM gets updated such
> that it isn't the same as where the code was checked out from, but that
> shouldn't matter, should it? We're not going to modify the original
> sources - we're just creating the branch. Right?
>
> Maybe I'm going about this all wrong, but I didn't find much in the way
> of documents/blogs/stories on Google - at least, nothing that shed any
> light on this for me.
>
> Thanks,
> Dave
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org