I use Subversion vendor branching ( http://bakery.cakephp.org/articles/view/vendor-branching ) to maintain all third party code, as you really need something that can compare three targets.
But if you do want to do it manually, WinMerge works well for me on Windows, using the "CVS/SVN Loose" filter and with "include subfolders" ticked. But this is quite tedious for something as large as the Cake core, and you still have to manage adds/deletes manually. And of course it won't understand your own modifications, if you have any. If you're already using Subversion for your own application, just spend the 30 minutes trying out vendor branching, it really is the best way. On Jun 5, 1:43 pm, ullumski <[EMAIL PROTECTED]> wrote: > If you haven't tried "filemerge" yet, i'd suggest you give it a try. > > It comes with the OSX- Developer Tools, is free and really does the > trick for me all the time. > > Cheers, > > Ullumski > > David Christopher Zentgraf wrote: > > Hi, > > > With the release of RC1 (Cheers!), I'll use the opportunity to ask the > > list what you use to update your Cake builds. > > What's the best tool for you to merge directory structures? Something > > like Diff for whole trees. > > I tried several tools on the Mac, but none have really worked all that > > well for me. > > Actually, the trick that worked best for me is to (ab)use tar, but I'd > > like something with more control. > > (http://macdiggs.com/index.php/2007/12/27/merge-two-folders-on-mac-usi... > > ) > > > What are you guys using? > > > Chrs, > > Dav --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "CakePHP" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/cake-php?hl=en -~----------~----~----~----~------~----~------~--~---
