Stories
Slash Boxes
Comments

NOTE: use Perl; is on undef hiatus. You can read content, but you can't post it. More info will be forthcoming forthcomingly.

use Perl

All the Perl that's Practical to Extract and Report

use Perl Log In

[ Create a new account ]

Ovid (2709)

Ovid
(email not shown publicly)
http://publius-ovidius.livejournal.com/
AOL IM: ovidperl (Add Buddy, Send Message)

Stuff with the Perl Foundation. A couple of patches in the Perl core. A few CPAN modules. That about sums it up.

Journal of Ovid (2709)

Friday July 20, 2007

03:39 AM

Easier Bulk Diff?

[ #33850 ]

In trying to track down a bug between two subtly different branches of code, I needed to know which files are different in the two branches (information which cvs doesn't always give), so I wrote this:

for file in `find lib -name '*.pm' -print`; \ > do diff --brief $file /home/ovid/work/master/$file; done 2>&1 \ > |grep -v 'No such file'|cut -d ' ' -f 2

Surely there's a better way to get a list of which files are different in two virtually identical directory structures?

List all Journal entries

Easier Bulk Diff? More | Login | Reply

The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.

Without JavaScript enabled, you might want to use the classic discussion system instead. If you login, you can remember this preference.

Re: Easier Bulk Diff? (Score:1)

by jmcnamara (659)

Would something like this do?

diff -qr dir1 dir2

John.
--
- Re: (Score:2)
  
  by Ovid (2709)
  
  That helps. I can use it to get that command down to this:
  
  diff -qr kill_dh_server/lib/ shared_cp/lib/|egrep -v 'CVS|Only in'|cut -d ' ' -f 2
  
  That let's me ignore CVS directories and files which are in one and not the other. If I want to include the latter:
  diff -qrN kill_dh_server/lib/ shared_cp/lib/ | grep -v CVS | cut -d ' ' -f 2
  
  It doesn't quite restrict me to everything I want, but it's pretty close. Thanks!
Graphical diff tool (Score:1)

by swillert (8019)

When having access to a GUI, I love to use meld [http://meld.sourceforge.net/] to do the job. This tool is simply amazing. It's a bit anemic on the command line options side, but has found me a lot of subtle bugs.
There needs to be an ackdiff (Score:1)

by runrig (3385)

No, I'm not volunteering :-)
If only you used svn (Score:1)

by Eric Wilhelm (6389)

http://scratchcomputing.com/svn/Module-Subversion-Juggle/trunk/bin/find_change [scratchcomputing.com]

Get More Comments

Reply

use Perl

All the Perl that's Practical to Extract and Report

Navigation

use Perl Log In

Ovid (2709)

Journal of Ovid (2709)

Easier Bulk Diff?

Easier Bulk Diff? 5 Comments More | Login | Reply /

Please Log In to Continue

Re: Easier Bulk Diff? (Score:1)

Re: (Score:2)

Graphical diff tool (Score:1)

There needs to be an ackdiff (Score:1)

If only you used svn (Score:1)