I'm not an expert with CVS but the branching support seemed to be focused on making it easier to port changes from one branch to the other. Derek was actually doing this with the "legacy" build system internally when he first started with WiX v3.
After a while the code bases started to diverge so much that porting the fixes across the branches just wasn't working out. He decided it was better to code the same fix twice in the cases where the fix needed to be done twice. So there is overhead when a bug applies to both versions. However, I expect this to become a very rare occurrence because we are working to reduce the changes being accepted to WiX v2. Adding some "forward compatibility" to WiX v2 for WiX v3 were the most "dangerous" changes lately... and I'm hoping we're just done with them. So, the upshot of the overhead is that I hope we don't do it much... and I think Derek might say he cut the branches to encourage people (er, me) to quit messing with WiX v2. <grin/> In CVS there are only separate modules because by the time I finally caught up with the work Derek had done, that's what he was doing. It may turn out this was a bad decision on my part. If so, I'll chalk it up to learning how to work with CVS and I will do the work to make everyone's life easier (again). Consider this a learning experience. <smile/> -----Original Message----- From: Frederik Carlier [mailto:[EMAIL PROTECTED] Sent: Tuesday, November 08, 2005 7:38 AM To: [EMAIL PROTECTED]; [email protected] Subject: RE: [WiX-devs] wix2.0 "branch" created, wix v3 coming soon. Rob, this is very exciting news :). I just took a look in the v3 branch and it looks really interesting. Out of curiousity, what exactly is it that you are trying to achieve that CVS branching does not offer you? I am currently diving into the joys of CVS so this would make an interesting case-study for me :). At a risk of pointing out the obvious, the CVS book (free PDF), http://cvsbook.red-bean.com/, seems to have good information about the CVS branch feature. Frederik. -----Original Message----- From: [EMAIL PROTECTED] on behalf of Rob Mensching Sent: Fri 11/4/2005 11:58 AM To: [email protected] Subject: [WiX-devs] wix2.0 "branch" created, wix v3 coming soon. If you watch the wix-commits mailing list closely, you should see a whole bunch of commits from me creating the "wix2.0" "branch". This "branch" (which is really just another CVS module because the CVS branching mechanism didn't seem to be what I wanted) is where future WiX v2 work will go. The goal of WiX v2 is to drive for a production quality release, no new features. Derek has been doing a great job killing off bugs here and has done some work to ease the transition to future WiX versions. The "wix" module will continue to be where active (unstable) development continues on with WiX v3. At the moment, the "wix" and "wix2.0" branches are identical but that will change as soon as I get the NAnt conversion code pushed into CVS correctly. This may happen as soon as tomorrow since John, Justin, and Bob have finished off the major bugs in the WiX NAnt build. Note, that Derek has done some incredible work in WiX v3. WiX v3 has more features than WiX v2 but will not be as stable any time soon. Anyway, this is just me finally starting to catch up with all the work from the last few months. I still need to get to the external contributions and that is high on my list after getting the WiX v3 code pushed and a new release out on SourceForge to address all the bugs that have been fixed. virtually, Rob Mensching http://blogs.msdn.com/robmen http://wix.sourceforge.net ------------------------------------------------------- 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 _______________________________________________ WiX-devs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/wix-devs
