Re: [Springframework-developer] branch-1-2 vs. mbranch-1-2

[Juergen H. <ju...@in...>]

mbranch-1-2 is the active maintenance branch, branched at 1.2.6. It is the
base for the upcoming 1.2.7 release, with lots of fixes and minor
enhancements backported from 2.0 M1/M2.

branch-1-2 was created earlier, after 1.2.5, and has effectively been
superseded by mbranch-1-2. The problem there was that we decided to keep CVS
HEAD at 1.2.x for a further while, but of course it's hard to delete or move
an already created branch...

It didn't seem feasible to delete branch-1-2 back at the time. However, if
we decide to get rid of it for clarity, we can as well try to delete it now.

Juergen
 

-----Original Message-----
From: spr...@li...
[mailto:spr...@li...] On Behalf Of
Colin Sampaleanu
Sent: Thursday, January 19, 2006 4:14 AM
To: spr...@li...
Subject: Re: [Springframework-developer] branch-1-2 vs. mbranch-1-2

Well I know why we need a 1.2 branch, :-), but I'm confused as to why
there's both
  branch-1-2
and
  mbranch-1-2

Colin


On 1/18/2006 10:08 PM, Thomas Risberg wrote:
> Colin,
>
> Does this ring a bell?
>
> Reply-To: spr...@li...
> Date: Thu, 22 Sep 2005 20:55:49 -0400
>
> My convention when making a branch is to use the same basic name as 
> the release, i.e.
> R_1-2-5
> becomes
> B_1-2-5
> where you then might have a release
> R_1-2-5-1
> coming off it later.
>
> But I guess in this case any release is going to be 1.2.6.
>
> So I would probably call it branch-1-2. I do like to call branches as 
> branches, since they have to be treated differently than normal tags.
>
> Colin
>
>
> Juergen Hoeller wrote:
>
> >Developers,
> >
> >I intend to create a Spring 1.2 maintenance branch now that 1.2.5 has
> been
> >released. Not a problem per se, but I'm wondering about the branch
> name :-)
> >
> >We have "release-1-2-5" style as tag names, so what could we use as 
> >maintenance branch name? "maintenance-1-2"? "1-2-maintenance"? Any 
> >suggestions?
> >
> >Juergen
> >
> >
> >
> >
> >-------------------------------------------------------
> >SF.Net email is sponsored by:
> >Tame your development challenges with Apache's Geronimo App Server. 
> Download
> >it for free - -and be entered to win a 42" plasma tv or your very own 
> >Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
> >_______________________________________________
> >Springframework-developer mailing list 
> >Spr...@li...
> >https://lists.sourceforge.net/lists/listinfo/springframework-develope
> >r
> >
> >
>
>
>
> -------------------------------------------------------
> SF.Net email is sponsored by:
> Tame your development challenges with Apache's Geronimo App Server. 
> Download
> it for free - -and be entered to win a 42" plasma tv or your very own 
> Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
> _______________________________________________
> Springframework-developer mailing list 
> Spr...@li...
> https://lists.sourceforge.net/lists/listinfo/springframework-developer
>
>
> On Jan 18, 2006, at 9:21 PM, Colin Sampaleanu wrote:
>
>> Juergen,
>>
>> What's the difference between branch-1-2 and mbranch-1-2, which both 
>> exist as branches in CVS?
>>
>>
>>
>> -------------------------------------------------------
>> This SF.net email is sponsored by: Splunk Inc. Do you grep through 
>> log files for problems?  Stop!  Download the new AJAX search engine 
>> that makes searching your log files as easy as surfing the  web.  
>> DOWNLOAD SPLUNK!
>> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121
>> 642 _______________________________________________
>> Springframework-developer mailing list 
>> Spr...@li...
>> https://lists.sourceforge.net/lists/listinfo/springframework-develope
>> r
>>
>>
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log 
> files for problems?  Stop!  Download the new AJAX search engine that 
> makes searching your log files as easy as surfing the  web.  DOWNLOAD 
> SPLUNK!
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=1216
> 42 _______________________________________________
> Springframework-developer mailing list 
> Spr...@li...
> https://lists.sourceforge.net/lists/listinfo/springframework-developer
>



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Springframework-developer mailing list
Spr...@li...
https://lists.sourceforge.net/lists/listinfo/springframework-developer