[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Develop on branch or mainline...

From: Greg A. Woods
Subject: Re: Develop on branch or mainline...
Date: Sat, 16 Mar 2002 15:50:51 -0500 (EST)

[ On Saturday, March 16, 2002 at 10:01:03 (-0800), Wim Kerkhoff wrote: ]
> Subject: Re: Develop on branch or mainline...
> What most people suggest to develop on the mainline. Fixes for past
> releases, expiremental development, and so on are done on branches, then
> merged back to the mainline as appropriate. 

Or conversely that fixes for past releases are merged onto release
branch(es) from the mainline trun, where they've initially been
developed and tested.  (in this case the merges are not always done
directly with CVS, but often with patch and sometimes by hand since of
course the mainline code may have diverged quite quickly from the older

(and experimental development branches are similarly kept in sync with
the mainline development by occasionally merging new changes from the
trunk, keeping a unique walking tag on the trunk to mark the last merge
to a given experimental branch)

                                                                Greg A. Woods

+1 416 218-0098;  <address@hidden>;  <address@hidden>;  <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>

reply via email to

[Prev in Thread] Current Thread [Next in Thread]