Details
-
Type:
Bug
-
Status:
Open
-
Priority:
Critical
-
Resolution: Unresolved
-
Affects Version/s: 2.0-beta-9
-
Fix Version/s: None
-
Component/s: branch
-
Labels:None
-
Environment:HideMaven2.2.0, WinXP + Solaris 8, CVS (pserver), maven release plugin 2.0-beta-9 with applied patched
MRELEASE-128andMRELEASE-159ShowMaven2.2.0, WinXP + Solaris 8, CVS (pserver), maven release plugin 2.0-beta-9 with applied patched MRELEASE-128 and MRELEASE-159
-
Number of attachments :
Description
When branching in CVS there are some strange things happening.
I would expect the following order:
1. create a branch with the specified name (without any changes in files)
2. modify the trunk and replace the version number (and no any other changes!!!!) (so development can go on)
3. BRANCH: modify the pom and add the scm-tag (it makes sense to hold the branch name there, even "tag" ist not so obvious)
Using this ordering it does not break anything if one step goes wrong (if branching fails the trunk is like before, if modifying the branch fails there are no problems on the trunk and the project can decide if it should take delete the branch when possible or just create a new version)
Needless to say, that this is NOT the order the branch-goal uses...
For the description below: I have a simple java-Project with a parent pom lying outside of the project (company-wide-superpom). SCM-Information is included in the parent pom and only a property is replaced. So on trunk there is no scm-tag at all.
When I look at the result in reality there are several problems:
1. The pom is modified in the trunk and the value 'scm-tag' is added BEFORE the branch gets created (nevertheless the result on the branch looks ok, only the change was made at the wrong place) If branching fails the trunk is in a wrong state and has to be fixed manually.
These should be switched to first create the branch and modify the pom on the branch
2. On the trunk now there is a scm-section written in the pom (which was completely absent as mentioned before) and it contains the information which would be correct on the branch (e.g. the tag-tag with the name of the branch) Additionally (see MRELEASE-128) the parameters gets replaced (this is not fixed in MRELEASE-128 yet and I currently wanted to fix it)
I think the only change on the trunk should be the version number! No properties should be replaced and even less adding new tags!
As I do not know why the ordering is made this way ( I assume it has something to do with some optimizations for svn) I do not want to change the order for my own.