logo       

Re: Diff 2 folders: msg#00103

t2.devel

Subject: Re: Diff 2 folders


Hi,

Reid Thompson wrote:
On Thu, 2008-08-21 at 16:17 +0100, Adam Stirk wrote:
Lars & Reid, Your both stars it worked a treat.

One more problem now though how do you stop diff from outputting the
command line?

In the example below you can see the "diff -ruN --exclude=.svn
t2_orig/package/network/openntpd/openntpd.init
t2-trunk/package/network/openntpd/openntpd.init" in the middle of the
output.

-[D] X madwifi-r3375.tar.gz svn+http://svn.madwifi.org/madwifi/trunk/
madwifi -r3375
+[D] X madwifi-r3837.tar.gz svn+http://svn.madwifi.org/madwifi/trunk/
madwifi -r3837
diff -ruN --exclude=.svn t2_orig/package/network/openntpd/openntpd.init
t2-trunk/package/network/openntpd/openntpd.init
--- t2_orig/package/network/openntpd/openntpd.init 1970-01-01
01:00:00.000000000 +0100
+++ t2-trunk/package/network/openntpd/openntpd.init 2008-08-04
01:46:40.000000000 +0100
@@ -0,0 +1,21 @@
+#
+


Thanks

Adam

-----Original Message-----
From: Lars Kuhtz [mailto:lars@xxxxxxxxxxxx] Sent: 21 August 2008 15:38
To: T2 developers mailing list
Subject: Re: [t2] Diff 2 folders


On Thursday 21 August 2008 16:29, Adam Stirk wrote:
The command I entered is

diff -ruN --exclude='*/.svn/*' t2_orig/package t2-trunk/package
Try --exclude='\.svn'.
The pattern is matched against files but not paths.

-- Lars

Thanks

Adam

-----Original Message-----
From: Reid Thompson [mailto:Reid.Thompson@xxxxxxxx]
Sent: 21 August 2008 15:11
To: Adam Stirk
Cc: t2@xxxxxxxxxxxxxx
Subject: RE: [t2] Diff 2 folders"diff -ruN
On Thu, 2008-08-21 at 14:37 +0100, Adam Stirk wrote:
I tried --exclude but it didn't seem to work.
what was the command you entered?

----------------------------------------------------------- If you wish to unsubscribe from this mailing, send mail to
lists@xxxxxxxxxxxxxx with a subject of: unsubscribe t2


back to grep...
diff -ruN --exclude=.svn dir1 dir2 | grep -v "diff -ruN"
Or just keep it in the resulting patch, as the the command line text is
just skipped over by the patch program as they are treated as comment
(not in between ---/+++ lines and outside the range of the @ addressed
chunks, ...).

Yours,

--
René Rebe - ExactCODE GmbH - Europe, Germany, Berlin
http://exactcode.de | http://t2-project.org | http://rene.rebe.name



----------------------------------------------------------- If you wish to unsubscribe from this mailing, send mail to
lists@xxxxxxxxxxxxxx with a subject of: unsubscribe t2



<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | FAQ | advertise