> -----Original Message----- > From: Barney Boisvert [mailto:[EMAIL PROTECTED] > Sent: Sunday, August 07, 2005 6:38 PM > To: CF-Talk > Subject: Re: OT: (svn) merging between multiple branches > > Nope, you're doing two things, so you have to commit twice.
Interesting idea. The complexity is that the code in trunk has changed but the branch has stayed as it was since the branching. I guess I was really wondering if there was a way to have one file diff (e.g. line 43 on both has changed the same way) be marked on two separate files without having to commit two changes, but I now that in the scheme of things I really shouldn't fuss over it :) -- Damien McKenna - Web Developer - [EMAIL PROTECTED] The Limu Company - http://www.thelimucompany.com/ - 407-804-1014 #include <stdjoke.h> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Logware (www.logware.us): a new and convenient web-based time tracking application. Start tracking and documenting hours spent on a project or with a client with Logware today. Try it for free with a 15 day trial account. http://www.houseoffusion.com/banners/view.cfm?bannerid=67 Message: http://www.houseoffusion.com/lists.cfm/link=i:4:214047 Archives: http://www.houseoffusion.com/cf_lists/threads.cfm/4 Subscription: http://www.houseoffusion.com/lists.cfm/link=s:4 Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=89.70.4 Donations & Support: http://www.houseoffusion.com/tiny.cfm/54
