Carlos doesn't need to worry, as the maven-meeper (or is it
archiva-meeper?) tree has remained untouched in the branch.
His changes there will remain current, in either approach.
Also, even if we go with option B (which seems to be leading the vote
counts so far) the commit messages will not be lost, the svn log should
still contain that information (if I'm not mistaken).
- Joakim
Wendy Smoak wrote:
On 4/25/07, Joakim Erdfelt <[EMAIL PROTECTED]> wrote:
As I see it we have 3 options.
option A [ ] Make the branch the new trunk.
option B [ ] Merge the branch into the existing trunk.
option C [ ] -1 Do not merge the branch into trunk.
I haven't looked at the code, but based on the volume of commits and
the summaries you've sent of far-reaching changes, I wonder if merging
will even work. Also, I'd like to preserve the commit messages rather
than have the svn log for trunk just say "merged rX:rY to trunk".
So I'd go for A, move trunk over to a 0.9 branch, then move your
branch onto trunk.
We would probably need to bring back the module that Carlos uses to
sync things to central. Are any of the other changes on trunk even
relevant to the refactored branch?
Arnaud, if you're willing to do the work, I'm still interested in an
0.9-alpha-2 build from what is now the trunk.
