Re: Diff 2 folders

This is a multi-part message in MIME format.
On Thursday 21 August 2008 16:06, Lars Kuhtz wrote:
> On Thursday 21 August 2008 15:37, Adam Stirk wrote:
> > GUI what's one of them? LOL
> >
> > Command line only for me I'm afraid.
> >
> > I have tried the -r approach before but I didn't get the required result,
> > I have just ran it with the -q option and it's picking up differences in
> > the .svn folders is there a way to exclude these folders? I tried
> > --exclude but it didn't seem to work.
>
> if -x does not work for you then 'grep' shall be your friend:
>
> diff -q -r dir1 dir2 | grep -v '.svn'

sorry, it should be:

diff -q -r dir1 dir2 | grep -v '\.svn'

>
> -- Lars
>
> > Adam
> >
> > -----Original Message-----
> > From: Reid Thompson [mailto:Reid.Thompson@xxxxxxxx]
> > Sent: 21 August 2008 14:03
> > To: Adam Stirk
> > Cc: T2 developers mailing list
> > Subject: Re: [t2] Diff 2 folders
> >
> > On Thu, 2008-08-21 at 11:39 +0100, Adam Stirk wrote:
> > > Hi,
> > >
> > >
> > >
> > > Is there an easy way too diff 2 folders?  For example I have two
> > > folders one named “t2_orig” this is t2 trunk that has been un-modified
> > > and one named “t2-trunk” which is my modified trunk with various fixes
> > > and new packages in.
> >
> > use diff -r  plus any other diff options you want to use.
> >
> > I imagine the gui diff programs would work similarly