I agree. Here is my plan
Change HEAD to 1.2-SNAPSHOT
Merge changes in branches/1.0 since configid was branched into configid
Move branches/configid to branches/1.1
Delete branches/1.0
Note before anyone gets excited. All of the history will still be in
svn, so we will not "loose" any thing.
-dain
On Feb 25, 2006, at 12:10 PM, Aaron Mulder wrote:
I thought that:
- HEAD would become 1.2-SNAPSHOT
- 1.0 branch would become 1.1-SNAPSHOT
- configId branch would be merged into 1.0 branch (1.1-SNAPSHOT)
I don't think we need a separate 1.0 branch and 1.1 branch, since
1.0.x is turning into 1.1. It might be less confusing to rename the
branch 1.x, but that would cause everyone to need to update their
checkouts... :(
Thanks,
Aaron
On 2/23/06, Matt Hogstrom <[EMAIL PROTECTED]> wrote:
John,
Life has been a travelling adventure lately so apologies for my
tardy response.
My thinking is as follows in order of steps:
1. Convert HEAD to 1.2 SNAPSHOT. This will be good as we need to
get this story
down to simply changing etc/project.properties or at least as
close as possible.
2. Once HEAD is changed and building correctly hopefully Dain and
David will
have something to show. I know they've been bustin their chops
working on this.
We rename their branches/configid to branches/1.1. We'd
have to ensure
that changes made to 1.0 since they started get moved into their
branch and then
we can delete the 1.0 branch since we have the 1.0.0.0 tag.
3. Apply the outstanding JIRA's I had previously identified. We
need to figure
out which ones are still important.
I'd like to get the release out by the end of March.
Is this clearer?
Matt
John Sisson wrote:
Alan D. Cabrera wrote:
On 2/20/2006 8:23 PM, Matt Hogstrom wrote:
I was thinking that in order to expedite getting 1.1 our the door
that it would make sense to move trunk to 1.2. Then we'll have
to do
the same in the 1.0 branch. I'm going to start working on that
this
week. Comments, suggestions, ?
So what is in trunk now? What is in branches/1_0 now? Where is
the
work for 1_1 taking place?
Matt,
Could you please confirm the following..
AFAIK, work for the 1.1 release (that was previously going to be
called
the 1.0.1 release) should be done in the 1.0 branch (until we
branch for
1.1?).
Matt is proposing to change the version numbers in files in
branches/1.0
to be 1.1. I assume you plan on doing this before we create the 1.1
branch?
Once the configId changes are merged in to branches/1.0 and we
are ready
for a release we would create branches/1.1 from the 1.0 branch.
If we are creating a 1.1 branch then does that mean there would
be no
further work happening in the 1.0 branch once the branch is made?
Work for the 1.2 release should be done in trunk. I think Matt is
proposing to change the version numbers in files in trunk to be 1.2.
Are we releasing version 1.1 of all the specs for the 1.1 release?
Thanks,
John
Regards,
Alan
