From: Patrice G. <pa...@ma...> - 2002-06-11 14:32:30
|
> From: anj...@t-... (Anjo Krank) > Reply-To: ak...@pr... > Date: Tue, 11 Jun 2002 08:52:17 +0200 > To: Patrice Gautier <pa...@ma...>, Andrus <an...@ob...>, > <won...@li...> > Subject: Re: [Wonder-disc] Fwd: Re: Open Source Framework > > on 11.06.2002 8:35 Uhr, Patrice Gautier at pa...@ma... wrote: > >> Sorry I'm not explaining this very clearly: >> >> scenario 1 >> >> V_1_0 branch, where we fix 1.0 bugs >> / >> trunk ----- ship 1.0 < >> \ >> continuation of the trunk --- ..... -- 2.0 >> >> >> >> >> scenario 2 >> >> V_1_0 branch - (bug fixes) - ship 1.0 -- more bug fixes >> / >> trunk -- < >> \ >> continuation of the trunk --- ..... ---- 2.0 >> >> >> >> and add merging of the bug fixes onto the trunk at appropriate spots. I like >> scenario 1 a bit better but could go either way, really. I think it's >> important we ship stable release soon, though. >> >> Do I get my ASCII art class diploma? > > Sure:) > > So if I get this right, to test/fix 1.0 bugs I'd have to checkout both > versions? Yuck. But I guess there is no way around this. Now I also see why > the bugtracking is needed. > > Cheers, Anjo > Actually to test/fix 1.0 bugs, you need to only check out the V_1_0 branch at the beginning. Once you have all your fixes you can either back port them by hand to the trunk (second check out involved) or use CVS merge facilities.. -P |