Re: [wtp-dev] Reminder to use "R1_5_maintenance" for maintenance branch

[Arthur Ryman <ryman@xxxxxxxxxx>]

David,

We all agree that dual maintenance is
both error prone and extra work, so I tend to favour the approach of assuming
all fixes go into both 1.5.1 and 2.0 unless it involves a new feature,
new API, etc. At that point we need to keep the new feaure/API out of 1.5.1
so that is the time to branch the plugin. However, we do need to minimize
what goes into 1.5.1. Only fixes to significant problems should be included.

Arthur Ryman,
IBM Software Group, Rational Division

blog: http://ryman.eclipsedevelopersjournal.com/
phone: +1-905-413-3077, TL 969-3077
assistant: +1-905-413-2411, TL 969-2411
fax: +1-905-413-4920, TL 969-4920
mobile: +1-416-939-5063, text: 4169395063@xxxxxxx

David M Williams <david_williams@xxxxxxxxxx>
Sent by: wtp-dev-bounces@xxxxxxxxxxx

06/22/2006 03:53 PM

Please respond to
"General discussion of project-wide or architectural issues." <wtp-dev@xxxxxxxxxxx>

To	wtp-dev@xxxxxxxxxxx
cc
Subject	[wtp-dev] Reminder to use "R1_5_maintenance" for maintenance branch        name

A few have asked me, so wanted to repeat, 

if anyone gets completely done with 1.5, and wants to put 1.5.1 fixes in
cvs, please branch your code using a WTP common name, namely

R1_5_maintenance 

the releng projects will be so branched after 1.5, when 1.5.1 builds start.

Last time, a few projects used slightly different names, and that was a
little confusing. 

Please remember that plugin version numbers need to be updated (using the
+100 rule) with the first change (and only first change) for a maintenance
release. 


Turns, out, as I was chatting with some developers as I wrote this note,
there's two trains of thought about when to literally branch the code in
cvs. 

Some think it should be done when code is first intended for 1.5.1,
even if the same fix is going in 2.0. 

Others think it should be done only when there is a known difference
between code intended for 1.5.1 and 2.0. 

We did it this later way last time, well, actually we left it up to each
team to decide, so some did it one way, others another, but, in my experience
(and others from 
community commented to me) it was very hard to load up "the most recent
code intended for 1.5.1" since everyone had a different system. Simply
"loading map projects" 
only gives you a version of code, and not necessarily the right branch
of code --- so, again, took a lot of extra work for someone to load up
correct version to propose a 
patch ... they pretty much would have to ask the component lead what to
load. 

Hence, I'll ask around, think though, and write up some more specific details
and proposals in "a how to do", and see if there is any community
thoughts on the matter. 
I don't want to add "more work" to anyone ... neither the committers
nor the community, so hope there's a solution that's easy for everyone.


Still, if you do branch your code ... the purpose of this note ... please
use a common name R1_5_maintenance. 

Thanks. 
_______________________________________________
wtp-dev mailing list
wtp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/wtp-dev