here's a few comments & questions to help me get some clarification on our branching strategy ---
if we do repeated merges between branch and head we'll potentially run into cvs-conflicts since any secondary merges will try to re-merge stuff from prior merges. so i think we either have to use an intermediate tagging protocol to keep track or merge points, or just manually make the changes in both and do the commits once for the head and once for the branch. either way's fine with me, so i just wanted to get folks' preferences or feedback before proceeding, and possibly put in my 2 cents too. if we choose to manually add changes to *both* the head and branch (i.e., two edits per change), and commit each separately, that's alright too, except that we'd probably not be taking advantage of cvs's features to their full potential (merge capabilities), and possibly be increasing the possibility for manual errors a bit too. in any case, its best to explicitly choose a strategy now, before committing or merging after the branch point, to avoid conflicts between opposing strategies. does jboss have a standard strategy for this? if jboss doesn't have a standard way of doing it, i may put in a vote for doing M1 bugfixes on the M1 branch and merging them into the head (tagging at each merge point with a numerically increasing tag pattern so that proper incremental merges can be done for new stuff between two versions) [or visa-versa, head->m1, doesn't matter], and doing new development on head. btw, are the features in M1 'frozen' or do we also want to add new development to M1? mike View the original post : http://www.jboss.org/index.html?module=bb&op=viewtopic&p=3831387#3831387 Reply to the post : http://www.jboss.org/index.html?module=bb&op=posting&mode=reply&p=3831387 ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ JBoss-Development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
