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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Juergen,

What's the difference between branch-1-2 and mbranch-1-2, which both 
exist as branches in CVS?

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-developer
 >
 >

-------------------------------------------------------
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=121642
> _______________________________________________
> Springframework-developer mailing list
> Spr...@li...
> https://lists.sourceforge.net/lists/listinfo/springframework-developer
>
>

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-developer
> >
> >
>
>
>
> -------------------------------------------------------
> 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=121642
>> _______________________________________________
>> 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
>

Well, this was back when 1.2.5 was released so I think the branch-1-2  
was created after 1.2.5 and never used while mbranch-1-2 is the  
current branch for 1.2.

Thomas

On Jan 18, 2006, at 10:13 PM, Colin Sampaleanu wrote:

> 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- 
>> developer
>> >
>> >
>>
>>
>>
>> -------------------------------------------------------
>> 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=121642
>>> _______________________________________________
>>> 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
>>
>
>
>
> -------------------------------------------------------
> 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
>
>

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

The 1.2.5 branch was also created as a precaution for the BEA support. 
In case any bugs would arise there we would have the branch ready to 
start working on it.

rgds
alef

Colin Sampaleanu wrote:
> 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-developer
>> >
>> >
>>
>>
>>
>> -------------------------------------------------------
>> 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=121642 
>>>
>>> _______________________________________________
>>> 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
>>
>
>
>
> -------------------------------------------------------
> 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

-- 
Alef Arendsen
Interface21 NL
Spring Services from the Source
http://www.interface21.com

Spring Core Developer
http://www.springframework.org

Author, "Professional Java Development with the Spring Framework"
(June 2005, with Rod Johnson, Juergen Hoeller, Colin Sampaleanu and
Thomas Risberg)
http://www.amazon.com/exec/obidos/ASIN/0764574833/

Interface21 NL B.V.
Donker Curtiusstraat 7-400c
1051JL Amsterdam
Phone: 020 486 20 36
Fax: 084 837 00 00
Mail: al...@in...
Skype: aarendsen

************************************ DISCLAIMER *********************
This email and any files transmitted with it are confidential
and intended solely for the use of the individual or entity to whom
they are addressed. If you have received this email in error please
notify the system manager. Please note that any views or opinions
presented in this email are solely those of the author and do not
necessarily represent those of the company. Finally, the recipient
should check this email and any attachments for the presence of
viruses. The company accepts no liability for any damage caused by
any virus transmitted by this email.
*********************************************************************

Just out of curiosity, has there been any discussion about switching to
subversion?  I was an avid CVS fan for a long time, and was really
reluctant to adopt subversion.  But once I started using it about a year
and a half ago, it really grew on me.  I especially like that branches
and tags are no longer this magical 3rd dimension, but are simply copies
of the trunk or any other branch.  I also really like how easy it is to
move and delete files.  I think CVS users--and I've seen comments on
this list about it--are often afraid to do refactorings that involve
moving files, simply because it dirties up the repository.  Just some
food for thought.

Brandon

On Wed, 2006-01-18 at 21:21 -0500, 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=121642
> _______________________________________________
> Springframework-developer mailing list
> Spr...@li...
> https://lists.sourceforge.net/lists/listinfo/springframework-developer