Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
With CVSNT this is very simple.... Just make sure you are on the tip of the Delta branch, then update with merge from HEAD. Now sort out your conflicts (there could be a lot if there has been a lot of development on both branch and TRUNK). Once you have Delta working again with the code from TRUNK, commit your edits to the Delta branch and just continue developing. there is absolutely no point in trying to move the branch point anywhere!!! CVSNT will show you exactly where the merge took place because it stores this in the RCS files on the server. Thus it knows from where it has been synchronized and the next time you merge the diffs will be calculated from the merge point and therefore the same conflicts will NOT appear again. I think the best way is to develop on Delta and frequently do the merge update against HEAD and commit. The more often you do it the easier it is because the conflicts are less likely to occur. /Bo -----Original Message----- From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org]On Behalf Of UL Jarod Sent: den 3 maj 2005 21:50 To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: [cvsnt] Branch woes To be completely honest, I've dug myself a bit of a hole. Our project is a single module. Our team planned to create a new generation of the software with substantial changes that were not ready for deployment to our users. So we created a branch on the module called Delta. Development then continued on both Delta and on the main trunk of the module. Here's my problem: We have now reached a point where Delta needs to use some crucial bug fixes that were made on certain trunk files. We would like Delta to have the most up to date code, as long as the trunk does not contain any code which is still not ready for users. This may not be the best way of going about this, and suggestions are welcome! My main question is this: I'd like to update the changes that were made to the trunk since the branching point onto Delta, and move the branch point to the front of the trunk. (Essentially rebranching, but without losing the changes made on the delta branch.) Any ideas would be very appreciated. Jarod _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs