Re: comment diff files

2011-11-25 Thread Ralf Mardorf
On Fri, 2011-11-25 at 22:17 +0100, Ralf Mardorf wrote:
> On Fri, 2011-11-25 at 18:14 +, Clive Standbridge wrote:
> > Jerome BENOIT wrote:
> > > Hello List:
> > > 
> > > Is there any way to comment a diff file ?
> > 
> > Interesting question.
> 
> ;D
> 
> Until now I'm only using, not writing patches.
> 
> What happens if we would write something at top of a diff or at the end
> of a diff file? In other words, before the first "diff" and behind the
> last "+" and "-" lines?
> 
> I suspect everybody experienced in writing patches knows the answer?!

Isn't it possible to add a comment that might be add to the patched file
and with the next step of your diff file, you'll remove this comment
from the patched file? So it just would be a comment for the diff
file???



-- 
To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org 
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1322256512.3009.107.camel@debian



Re: comment diff files

2011-11-25 Thread Ralf Mardorf
On Fri, 2011-11-25 at 18:14 +, Clive Standbridge wrote:
> Jerome BENOIT wrote:
> > Hello List:
> > 
> > Is there any way to comment a diff file ?
> 
> Interesting question.

;D

Until now I'm only using, not writing patches.

What happens if we would write something at top of a diff or at the end
of a diff file? In other words, before the first "diff" and behind the
last "+" and "-" lines?

I suspect everybody experienced in writing patches knows the answer?!


-- 
To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org 
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1322255857.3009.104.camel@debian



Re: comment diff files

2011-11-25 Thread Jerome BENOIT

Thanks !

On 25/11/11 19:14, Clive Standbridge wrote:

Jerome BENOIT wrote:

Hello List:

Is there any way to comment a diff file ?


Interesting question. I don't know, but perhaps this paragraph from
the patch(1) may help:

patch  tries to skip any leading garbage, apply the diff, and then skip
any trailing garbage.  Thus you could feed an article or message  con-
taining  a  diff  listing  to patch, and it should work.  If the entire
diff is indented by a consistent amount, or if a context diff contains
lines ending in CRLF or is encapsulated one or more times by prepending
"- " to lines starting with "-" as specified by Internet RFC 934,  this
is  taken  into  account.   After  removing indenting or encapsulation,
lines beginning with # are ignored, as they are considered to be  com-
ments.



Of course, I read `man diff' before sending the email to the list.

Jerome


--
To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org 
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Archive: http://lists.debian.org/4ecffbdb.8060...@rezozer.net



Re: comment diff files

2011-11-25 Thread Clive Standbridge
Jerome BENOIT wrote:
> Hello List:
> 
> Is there any way to comment a diff file ?

Interesting question. I don't know, but perhaps this paragraph from
the patch(1) may help:

patch  tries to skip any leading garbage, apply the diff, and then skip
any trailing garbage.  Thus you could feed an article or message  con-
taining  a  diff  listing  to patch, and it should work.  If the entire
diff is indented by a consistent amount, or if a context diff contains
lines ending in CRLF or is encapsulated one or more times by prepending
"- " to lines starting with "-" as specified by Internet RFC 934,  this
is  taken  into  account.   After  removing indenting or encapsulation,
lines beginning with # are ignored, as they are considered to be  com-
ments.


-- 
Cheers,
Clive


-- 
To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org 
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/2025181454.ga8...@rimmer.esmertec.com



Re: comment diff files

2011-11-25 Thread Lou

From: Jerome BENOIT  rezozer.net>


Is there any way to comment a diff file ?


I don't think so - you apply the diff using patch, then you put comments 
into the modified file, then you run a diff against the original version 
to get the difference with comments included.



--
To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org 
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Archive: http://lists.debian.org/blu0-smtp3178f19e9490abc9f3fa59fd8...@phx.gbl



comment diff files

2011-11-25 Thread Jerome BENOIT

Hello List:

Is there any way to comment a diff file ?

Thanks in advance,
Jerome


--
To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org 
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Archive: http://lists.debian.org/4ecfd177.3000...@rezozer.net



Re: diff files matching a pattern

2008-02-26 Thread Kamaraju S Kusumanchi
Raj Kiran Grandhi wrote:

> Mark Neidorff wrote:
>> Excuse me.  I don't want to appear rude, but are you a student at Cornell
>> and are we doing your CS homework for you?
> 
> Excuse me. I don't want to appear rude, but you could have foud it out
> yourself had you bothered to visit the OP's webpage/blog mentioned in
> his signature.
> 

Thanks Rajki.

raju
-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Kamaraju S Kusumanchi
Mark Neidorff wrote:

> Excuse me.  I don't want to appear rude, but are you a student at Cornell
> and are we doing your CS homework for you?
> 

No offense taken...

First, I would love to find a course here at Cornell (or online for that
matter) which gives problems such as this for homework! If you know of any,
please let me know either via email or through this list.

Secondly, it is a very serious "academic integrity" violation to discuss my
homework problems out on a public list such as d-u. I know, I am lazy; but
not lazy enough to get into trouble!

hth
raju
-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Raj Kiran Grandhi

Mark Neidorff wrote:
Excuse me.  I don't want to appear rude, but are you a student at Cornell and 
are we doing your CS homework for you?


Excuse me. I don't want to appear rude, but you could have foud it out 
yourself had you bothered to visit the OP's webpage/blog mentioned in 
his signature.


You appear to be relatively new here. Please see:
1. http://www.debian.org/MailingLists/#codeofconduct
2. http://www.netmeister.org/news/learn2quote.html



On Sunday 24 February 2008 02:21 pm, Kamaraju S Kusumanchi wrote:

Let's say I have two directories dir1, dir2 each with 1000 files.
Of these 1000 files in each directory, there are 50 files named file1.txt,
file2.txt ... file50.txt. The rest of the files do not follow any pattern
and are very large in size.

Now is there any way to compare

dir1/file1.txt and dir2/file1.txt
dir1/file2.txt and dir2/file2.txt

dir1/file50.txt and dir2/file50.txt


Manually diffing the files 50 times is cumbersome. Something like

diff dir1/file*.txt dir2/file*.txt

is what I am after. I do not want to do

diff -r dir1 dir2

since that compares the other 950 files as well besides the 50 files that I
want. Any idea how to achieve this in the most generic fashion? Has anyone
done this kind of thing before?

thanks
raju
--
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/






--
Raj Kiran Grandhi
--
At the source of every error which is blamed on the computer, you will 
find at least two human errors, including the error of blaming it on the 
computer.



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]




Re: diff files matching a pattern

2008-02-26 Thread Mark Neidorff
Excuse me.  I don't want to appear rude, but are you a student at Cornell and 
are we doing your CS homework for you?

On Sunday 24 February 2008 02:21 pm, Kamaraju S Kusumanchi wrote:
> Let's say I have two directories dir1, dir2 each with 1000 files.
> Of these 1000 files in each directory, there are 50 files named file1.txt,
> file2.txt ... file50.txt. The rest of the files do not follow any pattern
> and are very large in size.
>
> Now is there any way to compare
>
> dir1/file1.txt and dir2/file1.txt
> dir1/file2.txt and dir2/file2.txt
> 
> dir1/file50.txt and dir2/file50.txt
>
>
> Manually diffing the files 50 times is cumbersome. Something like
>
> diff dir1/file*.txt dir2/file*.txt
>
> is what I am after. I do not want to do
>
> diff -r dir1 dir2
>
> since that compares the other 950 files as well besides the 50 files that I
> want. Any idea how to achieve this in the most generic fashion? Has anyone
> done this kind of thing before?
>
> thanks
> raju
> --
> Kamaraju S Kusumanchi
> http://www.people.cornell.edu/pages/kk288/
> http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Richard Lyons
On Tue, Feb 26, 2008 at 01:12:09PM -0500, Kamaraju S Kusumanchi wrote:

> Richard Lyons wrote:
> 
> >> Damn the shell! Did not even think about this. Thanks Rajki.
> > 
> > You should have read _my_ solution on sunday.  There was a note about
> > this in the comments at the top.  
> > 
> 
> You are right, I should've. Thanks for the script, Richard. I basically
> looked at Raj Kiran's script, then I saw the usage of ## operator. I

Yes, they are useful those ## and %% operators.  My trouble is I can
never remember which is which, so always have to man bash, /##,...

Hope you get it sorted.

-- 
richard


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Kamaraju S Kusumanchi
Richard Lyons wrote:

>> Damn the shell! Did not even think about this. Thanks Rajki.
> 
> You should have read _my_ solution on sunday.  There was a note about
> this in the comments at the top.  
> 

You are right, I should've. Thanks for the script, Richard. I basically
looked at Raj Kiran's script, then I saw the usage of ## operator. I
thought I would read about this and come back to your script. Afterwards, I
got distracted with a bunch of other thing going around.

raju
-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Richard Lyons
On Tue, Feb 26, 2008 at 10:50:57AM -0500, Kamaraju S Kusumanchi wrote:

> Raj Kiran Grandhi wrote:
> 
> > The pattern should be in quotes, so that the shell does not expand it
> > and it gets passed to your script.
> > 
> > So it should be
> > $patlist "file*"
> > 
> 
> Damn the shell! Did not even think about this. Thanks Rajki.

You should have read _my_ solution on sunday.  There was a note about 
this in the comments at the top.  

good luck 

richard


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Kamaraju S Kusumanchi
Raj Kiran Grandhi wrote:

> The pattern should be in quotes, so that the shell does not expand it
> and it gets passed to your script.
> 
> So it should be
> $patlist "file*"
> 

Damn the shell! Did not even think about this. Thanks Rajki.

raju


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-26 Thread Raj Kiran Grandhi

Kamaraju S Kusumanchi wrote:



I must be doing something wrong here. Consider this reduced problem. I tried
to write a script to list all the files matching a specific pattern.
Consider

$cat ~/bin/patlist
#! /bin/sh
# to list all the files matching a given pattern
# call as patlist 
pattern="$1"
for file in $pattern; do
  echo $file
done


$ls file*
file1.txt  file2.txt  file3.txt

$patlist file*
file1.txt

That is for some reason patlist script lists only the first file the matches
the pattern and not all the files.


The pattern should be in quotes, so that the shell does not expand it 
and it gets passed to your script.


So it should be
$patlist "file*"

--
Raj Kiran Grandhi
--
At the source of every error which is blamed on the computer, you will 
find at least two human errors, including the error of blaming it on the 
computer.



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]




Re: diff files matching a pattern

2008-02-26 Thread Kamaraju S Kusumanchi
Raj Kiran Grandhi wrote:


> #call as script-name  dir1 dir2
> pattern="$1"
> dir1="$2"
> dir2="$3"
> for file in $dir1/$pattern; do
>  diff $file dir2${file##${dir1}}
> done
> 

I must be doing something wrong here. Consider this reduced problem. I tried
to write a script to list all the files matching a specific pattern.
Consider

$cat ~/bin/patlist
#! /bin/sh
# to list all the files matching a given pattern
# call as patlist 
pattern="$1"
for file in $pattern; do
  echo $file
done


$ls file*
file1.txt  file2.txt  file3.txt

$patlist file*
file1.txt

That is for some reason patlist script lists only the first file the matches
the pattern and not all the files.

I am using Debian Etch
$/bin/bash --version
/bin/bash --version
GNU bash, version 3.1.17(1)-release (i486-pc-linux-gnu)
Copyright (C) 2005 Free Software Foundation, Inc.


raju
-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Raj Kiran Grandhi

Kamaraju S Kusumanchi wrote:

Eduardo M KALINOWSKI wrote:

for i in `seq 1 50`; do diff dir1/file$i.txt dir2/file$i.txt >
diff$i.txt ; done



Ok, this works on the command line. But I am looking for something along the
lines of

bash_script_name dir1/pattern1 dir2/pattern2


where dir1/pattern1, dir2/pattern2 are given as arguments to the script. I
could not figure out how to do this inside a bash script. Any idea?


#call as script-name  dir1 dir2
pattern="$1"
dir1="$2"
dir2="$3"
for file in $dir1/$pattern; do
diff $file dir2${file##${dir1}}
done



raju




--
Raj Kiran Grandhi
--
At the source of every error which is blamed on the computer, you will 
find at least two human errors, including the error of blaming it on the 
computer.



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]




Re: diff files matching a pattern

2008-02-24 Thread Richard Lyons
On Sun, Feb 24, 2008 at 03:12:34PM -0500, Kamaraju S Kusumanchi wrote:

> Tzafrir Cohen wrote:
> > 
> > LC_ALL=C diff -r dir1 dir2 | grep -v ^Only
> > 
> > The size really doesn't matter for those extra large files.
> > 
> 
> This works only if the extra 950 files are in just one directory. If the
> extra files are there in both the directories, then it does not make sense
> to compare all the 1000 files since I am interested only in the diff of 50
> files.

I hadn't realized the other files were also repeated in both
directories.  I also had a couple of typos/bugs in the script I
suggested earlier.  This allows you to filter on a pattern with
wildcards, and seems superficially to work:
--
#!/bin/bash
# usage: diff-check dir1 dir2 "pattern"
# pattern must be in double quotes to avoid shell expasion
myday=`date +%y%m%d-%H:%M`
outfile="diff-check-$myday"
for f in `ls $1/$3` ; do
  fname=${f##*/}
  if [ -f $2/$fname ] ; then
echo checking file $fname
echo $fname in $1, $2 >> $outfile
echo "" >> $outfile
diff $1/$fname $2/$fname >> $outfile
echo "" >> $outfile
nr=$((co ++))
  fi
done
echo $co files compared.
---

Adjust to taste

HTH

-- 
richard


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Tzafrir Cohen
On Sun, Feb 24, 2008 at 03:12:34PM -0500, Kamaraju S Kusumanchi wrote:
> Tzafrir Cohen wrote:
> > 
> > LC_ALL=C diff -r dir1 dir2 | grep -v ^Only
> > 
> > The size really doesn't matter for those extra large files.
> > 
> 
> This works only if the extra 950 files are in just one directory. If the
> extra files are there in both the directories, then it does not make sense
> to compare all the 1000 files since I am interested only in the diff of 50
> files.

For this *not* to work, you have to use the option -N (or something
comparable) to diff.

-- 
Tzafrir Cohen | [EMAIL PROTECTED] | VIM is
http://tzafrir.org.il || a Mutt's
[EMAIL PROTECTED] ||  best
ICQ# 16849754 || friend


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Kamaraju S Kusumanchi
Tzafrir Cohen wrote:
> 
> LC_ALL=C diff -r dir1 dir2 | grep -v ^Only
> 
> The size really doesn't matter for those extra large files.
> 

This works only if the extra 950 files are in just one directory. If the
extra files are there in both the directories, then it does not make sense
to compare all the 1000 files since I am interested only in the diff of 50
files.

raju

-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Tzafrir Cohen
On Sun, Feb 24, 2008 at 02:21:56PM -0500, Kamaraju S Kusumanchi wrote:
> Let's say I have two directories dir1, dir2 each with 1000 files.
> Of these 1000 files in each directory, there are 50 files named file1.txt,
> file2.txt ... file50.txt. The rest of the files do not follow any pattern
> and are very large in size.
> 
> Now is there any way to compare
> 
> dir1/file1.txt and dir2/file1.txt
> dir1/file2.txt and dir2/file2.txt
> 
> dir1/file50.txt and dir2/file50.txt
> 
> 
> Manually diffing the files 50 times is cumbersome. Something like
> 
> diff dir1/file*.txt dir2/file*.txt
> 
> is what I am after. I do not want to do
> 
> diff -r dir1 dir2
> 
> since that compares the other 950 files as well besides the 50 files that I
> want. Any idea how to achieve this in the most generic fashion? Has anyone
> done this kind of thing before?

LC_ALL=C diff -r dir1 dir2 | grep -v ^Only

The size really doesn't matter for those extra large files.

-- 
Tzafrir Cohen | [EMAIL PROTECTED] | VIM is
http://tzafrir.org.il || a Mutt's
[EMAIL PROTECTED] ||  best
ICQ# 16849754 || friend


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Richard Lyons
On Sun, Feb 24, 2008 at 02:21:56PM -0500, Kamaraju S Kusumanchi wrote:

> Let's say I have two directories dir1, dir2 each with 1000 files.
> Of these 1000 files in each directory, there are 50 files named file1.txt,
> file2.txt ... file50.txt. The rest of the files do not follow any pattern
> and are very large in size.
> 
> Now is there any way to compare
> 
> dir1/file1.txt and dir2/file1.txt
> dir1/file2.txt and dir2/file2.txt
> 
> dir1/file50.txt and dir2/file50.txt

Something like:

#!/bin/bash
myday=`date +%y%m%d`
outfile="diff-check-$myday"
for f in `ls $1` ; do
  if [ -f $2/$f ] ; then
echo file $f >> $outfile
echo "" >> $outfile
diff $1/$f $2/$f >> $outfile
echo "" >> $outfile
  fi
done

(untested) but it ought to do it.  Well, it's a starting point. Save it as
~/bin/diff-check where ~/bin is on your path, and chmod u+x.  Call it like this
'diff-check dir1 dir2' and its results will be in the directory from which you
called it.  

HTH


-- 

richard



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Kamaraju S Kusumanchi
Eduardo M KALINOWSKI wrote:

>>
>> Manually diffing the files 50 times is cumbersome. Something like
>>
>> diff dir1/file*.txt dir2/file*.txt
>>
>> is what I am after. I do not want to do
>>
>> diff -r dir1 dir2
>>
>> since that compares the other 950 files as well besides the 50 files that
>> I want. Any idea how to achieve this in the most generic fashion? Has
>> anyone done this kind of thing before?
>>
>> thanks
>> raju
>>   
> for i in `seq 1 50`; do diff dir1/file$i.txt dir2/file$i.txt >
> diff$i.txt ; done
> 

Ok, this works on the command line. But I am looking for something along the
lines of

bash_script_name dir1/pattern1 dir2/pattern2


where dir1/pattern1, dir2/pattern2 are given as arguments to the script. I
could not figure out how to do this inside a bash script. Any idea?

raju

-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread strawks
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Eduardo M KALINOWSKI wrote:
> Kamaraju S Kusumanchi wrote:
[...]
>> Manually diffing the files 50 times is cumbersome. Something like
>>
>> diff dir1/file*.txt dir2/file*.txt
>>
>> is what I am after. I do not want to do
>>
>> diff -r dir1 dir2
[...]
> for i in `seq 1 50`; do diff dir1/file$i.txt dir2/file$i.txt >
> diff$i.txt ; done

you could also do something like this (using patterns) :
for var in dir1/file*.txt; do diff "$var" dir2/ ; done

- --
strawks
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHwcoC+2TXLlA5m78RAnSlAJ9u2wB33NiigC7o72O+MaQkG0tAQACffhBo
B28+5af8DPxEiPN4UJ5CrUY=
=U+tc
-END PGP SIGNATURE-


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Michael Marsh
On Sun, Feb 24, 2008 at 2:21 PM, Kamaraju S Kusumanchi
<[EMAIL PROTECTED]> wrote:
> Let's say I have two directories dir1, dir2 each with 1000 files.
>  Of these 1000 files in each directory, there are 50 files named file1.txt,
>  file2.txt ... file50.txt. The rest of the files do not follow any pattern
>  and are very large in size.
>
>  Now is there any way to compare
>
>  dir1/file1.txt and dir2/file1.txt
>  dir1/file2.txt and dir2/file2.txt
>  
>  dir1/file50.txt and dir2/file50.txt
>
>
>  Manually diffing the files 50 times is cumbersome. Something like
>
>  diff dir1/file*.txt dir2/file*.txt

I think this should work:
$ diff --to-file=dir2 dir1/file*.txt

-- 
Michael A. Marsh
http://www.umiacs.umd.edu/~mmarsh
http://mamarsh.blogspot.com
http://36pints.blogspot.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: diff files matching a pattern

2008-02-24 Thread Eduardo M KALINOWSKI

Kamaraju S Kusumanchi wrote:

Let's say I have two directories dir1, dir2 each with 1000 files.
Of these 1000 files in each directory, there are 50 files named file1.txt,
file2.txt ... file50.txt. The rest of the files do not follow any pattern
and are very large in size.

Now is there any way to compare

dir1/file1.txt and dir2/file1.txt
dir1/file2.txt and dir2/file2.txt

dir1/file50.txt and dir2/file50.txt


Manually diffing the files 50 times is cumbersome. Something like

diff dir1/file*.txt dir2/file*.txt

is what I am after. I do not want to do

diff -r dir1 dir2

since that compares the other 950 files as well besides the 50 files that I
want. Any idea how to achieve this in the most generic fashion? Has anyone
done this kind of thing before?

thanks
raju
  
for i in `seq 1 50`; do diff dir1/file$i.txt dir2/file$i.txt > 
diff$i.txt ; done


For details on for, se man bash.

--
He had occasional flashes of silence that made his conversation perfectly
delightful.
-- Sydney Smith

Eduardo M KALINOWSKI
[EMAIL PROTECTED]
http://move.to/hpkb


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]




diff files matching a pattern

2008-02-24 Thread Kamaraju S Kusumanchi
Let's say I have two directories dir1, dir2 each with 1000 files.
Of these 1000 files in each directory, there are 50 files named file1.txt,
file2.txt ... file50.txt. The rest of the files do not follow any pattern
and are very large in size.

Now is there any way to compare

dir1/file1.txt and dir2/file1.txt
dir1/file2.txt and dir2/file2.txt

dir1/file50.txt and dir2/file50.txt


Manually diffing the files 50 times is cumbersome. Something like

diff dir1/file*.txt dir2/file*.txt

is what I am after. I do not want to do

diff -r dir1 dir2

since that compares the other 950 files as well besides the 50 files that I
want. Any idea how to achieve this in the most generic fashion? Has anyone
done this kind of thing before?

thanks
raju
-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: .diff files

2001-02-15 Thread Corrin Lakeland
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


> Now I'm faced with my utter ignorance.  I have a couple linux boxes, but
> this is my first crack at debian.  There are some patches that let my use
> various hardware features (eg touch screen), but they come in the form of
> .diff files.  I haven't dealt with this file type before.  How do I use
> these files?

A diff file is created by (surprise) the program 'diff'.  There is a program 
called patch for automatically applying diff files to an original file (often 
referred to as .orig).  you may find the following works:
patch -p0 filename.diff

For  people have distributed diffs designed for patch as 
.patch files rather than .diff files, so it is possible your .diff file 
specifically does not work with patch, or is very old.

Anyway, you should be able to get there eventually, just fiddle the arguments 
a little.

Oh, you have to have the original (unmodified) file that you apply the patch 
to, the .diff only contains the differences to the original.

Corrin Lakeland
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.0.4 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE6jGhz9o3gUBuxj/sRAgVjAKCjGioAaMv+LfNhqhMLoCPMKEA92gCgo1K2
kd0Fdt12TvqwdKbfkjXYq9Q=
=Z5MK
-END PGP SIGNATURE-



.diff files

2001-02-15 Thread Peter Howell
I managed to get a base debian potato to boot on my ricoh 
g1200s.  (Everyone cheer)
Now I'm faced with my utter ignorance.  I have a couple linux boxes, but 
this is my first crack at debian.  There are some patches that let my use 
various hardware features (eg touch screen), but they come in the form of 
.diff files.  I haven't dealt with this file type before.  How do I use 
these files?


Thanks

Peter



pine diff files, and .debs (fwd)

1999-02-25 Thread Paul Nathan Puri


NatePuri
Certified Law Student
& Debian GNU/Linux Monk
McGeorge School of Law
[EMAIL PROTECTED]
http://ompages.com

-- Forwarded message --
Date: Wed, 24 Feb 1999 17:49:05 -0800 (PST)
From: Paul Nathan Puri <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: pine diff files, and .debs


I merely wish to post my debian packages to my personal web site for
newbies to download and install.  Here is the .diff file

I will include the legal notices provided by the package on my web site,
http://www.ompages.com/debian/pkgs/pine/.  Please inform me as to your
view on the subject.  Thank you.

NatePuri
Certified Law Student
& Debian GNU/Linux Monk
McGeorge School of Law
[EMAIL PROTECTED]
http://ompages.com


pine_3.96M-2.diff.gz
Description: Binary data