Re: Tools for merging directories

2008-06-10 Thread Grant Cox
Ahh. I saw the "kind is folder", but I didn't know about "none of the following is true". Good stuff :) On Jun 7, 1:58 pm, "David C. Zentgraf" <[EMAIL PROTECTED]> wrote: > On 6 Jun 2008, at 09:57,GrantCoxwrote: > > > How do you list "all files" in spotlight? > > Okay, wow, that was indeed surp

Re: Tools for merging directories

2008-06-06 Thread David C. Zentgraf
Looks interesting, I'll play around with it. Thanks. On 6 Jun 2008, at 17:19, Kim F wrote: > I use piston for my vendor branching needs, really works perfectly. > http://piston.rubyforge.org/ --~--~-~--~~~---~--~~ You received this message because you are subscr

Re: Tools for merging directories

2008-06-06 Thread David C. Zentgraf
On 6 Jun 2008, at 09:57, Grant Cox wrote: > How do you list "all files" in spotlight? Okay, wow, that was indeed surprisingly non-straight forward. As I don't want to start an OS flamewar here, I'll just list the facts: ;o) Open the Cake folder. Hit Cmd+F to initiate a Search. Make sure the C

Re: Tools for merging directories

2008-06-06 Thread Kim F
I use piston for my vendor branching needs, really works perfectly. http://piston.rubyforge.org/ On Jun 6, 8:25 am, "David Zentgraf" <[EMAIL PROTECTED]> wrote: > Oh, of course, deleting them in the Finder shouldn't be too hard. I > was too fixated on the CLI. I'll try it when I get home. > > On 6

Re: Tools for merging directories

2008-06-05 Thread David Zentgraf
Oh, of course, deleting them in the Finder shouldn't be too hard. I was too fixated on the CLI. I'll try it when I get home. On 6/6/08, Grant Cox <[EMAIL PROTECTED]> wrote: > > I was about to reply with something glib - since all you want to do is > list all files in the folder (recursively), sel

Re: Tools for merging directories

2008-06-05 Thread Grant Cox
I was about to reply with something glib - since all you want to do is list all files in the folder (recursively), select them and delete (trivial with Windows Explorer). However I had a chat with one of our Mac guys here, and we couldn't figure it out in Finder / Spotlight. How do you list "all

Re: Tools for merging directories

2008-06-05 Thread David C. Zentgraf
To be quite honest, I don't get it. :-D How would you use the Left/Right/Ancestor/Merge fields for updating your working copy? As far as I understand you'd still need to maintain a /vendors branch of the original versions (ancestor)? Is it handling collisions elegantly enough without having t

Re: Tools for merging directories

2008-06-05 Thread ullumski
Well - you can drag folders into the "left" and "right" dropzones. Then drag again for ancestor and merge (destination). That way you get a pretty intuitive view similar to any subversionclient. Folders or Files with changes in them have no checkmarks, folders without have none. There are hotkey

Re: Tools for merging directories

2008-06-05 Thread David C. Zentgraf
Hi Grant, I read the SVN book vendor branching article in the meantime and agree with your points. Quite a lot of dilemmas that can pop up. What I'm still not sure about is how to best update the /vendors/ current directory. Your article only covers the Windows del command. Are there equiva

Re: Tools for merging directories

2008-06-05 Thread Grant Cox
Yes, with vendor branching you basically create a diff of the changes to the CakePHP core, then apply that to your own copy. Do you have a File/Folder merge utility that can do this - compare between the original core, the new core, and your application core? Because just comparing between the n

Re: Tools for merging directories

2008-06-04 Thread David C. Zentgraf
I love FileMerge, for merging *files*. I find it very lacking for merging whole tree structures. How do you use it? Am I missing something? I poked around a bit more and came across Araxis Merge (http://www.araxis.com/merge_mac/ ), which I just used to merge RC1 into my app. It still has a

Re: Tools for merging directories

2008-06-04 Thread David C. Zentgraf
Hmm, that strategy still seems pretty messy and manual. Basically to summarize, you're still manually merging/replacing the cake folder in a sandbox directory , and then apply the resulting Diff to your actual working copy? Doesn't seem a whole lot better than going through your working copy

Re: Tools for merging directories

2008-06-04 Thread Grant Cox
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" fil

Re: Tools for merging directories

2008-06-04 Thread ullumski
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 t

Tools for merging directories

2008-06-04 Thread David Christopher Zentgraf
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 we