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 m

Re: diff files matching a pattern

2008-02-24 Thread Tzafrir Cohen
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. Somethi

Re: diff files matching a pattern

2008-02-24 Thread Richard Lyons
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-$m

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 compare

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 w

Re: diff files matching a pattern

2008-02-24 Thread Michael Marsh
es 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 cum

Re: diff files matching a pattern

2008-02-24 Thread Eduardo M KALINOWSKI
ay 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

diff files matching a pattern

2008-02-24 Thread Kamaraju S Kusumanchi
t 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

Re: diff between amd64 and ia64

2007-12-22 Thread Ron Johnson
On Saturday December 22 2007 13:32:32 Bogart Salzberg wrote: > On Dec 22, 2007, at 2:16 PM, Jose Luis Rivas Contreras wrote: > > > > Ron Johnson wrote: > >> On Saturday December 22 2007 10:11:48 Sven Hoexter wrote: > >>> On Sat, Dec 22, 2007 at 04:45:25PM +0100, abdelkader > >>> belahcene > >> > >>

Re: diff between amd64 and ia64

2007-12-22 Thread Alan Chandler
On Saturday 22 Dec 2007, abdelkader belahcene wrote: > HI, > I have an AMD laptop, > I downoloaded ia64 iso image , I thought it is the same, > I can't boot with the CD; > what is the difference between them? > best regards > bela ia64 is the itanium processor amd64 covers the 64bit intel and a

Re: diff between amd64 and ia64

2007-12-22 Thread Bogart Salzberg
On Dec 22, 2007, at 2:16 PM, Jose Luis Rivas Contreras wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ron Johnson wrote: On Saturday December 22 2007 10:11:48 Sven Hoexter wrote: On Sat, Dec 22, 2007 at 04:45:25PM +0100, abdelkader belahcene wrote: HI, I have an AMD laptop, I downol

Re: diff between amd64 and ia64

2007-12-22 Thread Jose Luis Rivas Contreras
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ron Johnson wrote: > On Saturday December 22 2007 10:11:48 Sven Hoexter wrote: >> On Sat, Dec 22, 2007 at 04:45:25PM +0100, abdelkader belahcene > wrote: >>> HI, >>> I have an AMD laptop, >>> I downoloaded ia64 iso image , I thought it is the same,

Re: diff between amd64 and ia64

2007-12-22 Thread Ron Johnson
On Saturday December 22 2007 10:11:48 Sven Hoexter wrote: > On Sat, Dec 22, 2007 at 04:45:25PM +0100, abdelkader belahcene wrote: > > HI, > > I have an AMD laptop, > > I downoloaded ia64 iso image , I thought it is the same, > > I can't boot with the CD; > > what is the difference between them?

Re: diff between amd64 and ia64

2007-12-22 Thread Branko Djurkovic
Just to announce, amd64 (x86_64) is used both on AMD's (Athlon/Opteron) and Intel's (Pentium D/Core/Core 2 Duo...) CPUs. So you need to download amd64 version anyway. On Dec 22, 2007 5:11 PM, Sven Hoexter <[EMAIL PROTECTED]> wrote: > On Sat, Dec 22, 2007 at 04:45:25PM +0100, abdelkader belahcene

Re: diff between amd64 and ia64

2007-12-22 Thread Sven Hoexter
On Sat, Dec 22, 2007 at 04:45:25PM +0100, abdelkader belahcene wrote: > HI, > I have an AMD laptop, > I downoloaded ia64 iso image , I thought it is the same, > I can't boot with the CD; > what is the difference between them? It's a different architecture. http://en.wikipedia.org/wiki/IA64 http:

Re: diff between amd64 and ia64

2007-12-22 Thread Branko Djurkovic
Heh, I had the same 'prob' :) IA64 is Intel's 64bit technology for Itanium server architecture ( http://en.wikipedia.org/wiki/IA-64) you need amd64 version for your notebook. On Dec 22, 2007 4:45 PM, abdelkader belahcene <[EMAIL PROTECTED]> wrote: > HI, > I have an AMD laptop, > I downoloaded

diff between amd64 and ia64

2007-12-22 Thread abdelkader belahcene
HI, I have an AMD laptop, I downoloaded ia64 iso image , I thought it is the same, I can't boot with the CD; what is the difference between them? best regards bela -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: question re. diff. kernels

2007-04-14 Thread Gilles Mocellin
Le samedi 14 avril 2007 00:22, Greg Folkert a écrit : > On Fri, 2007-04-13 at 17:41 -0400, Miles Fidelman wrote: > > Hi Folks, > > > > I've just been busy installing Xen, and noticed that there are two > > different kernels available for the 686: > > > > xen-linux-system-2.6.18-4-xen-686 > > and >

Re: question re. diff. kernels

2007-04-13 Thread Greg Folkert
On Fri, 2007-04-13 at 17:41 -0400, Miles Fidelman wrote: > Hi Folks, > > I've just been busy installing Xen, and noticed that there are two > different kernels available for the 686: > > xen-linux-system-2.6.18-4-xen-686 > and > xen-linux-system-2.6.18-4-xen-vserver-686 > > Both described as "X

question re. diff. kernels

2007-04-13 Thread Miles Fidelman
Hi Folks, I've just been busy installing Xen, and noticed that there are two different kernels available for the 686: xen-linux-system-2.6.18-4-xen-686 and xen-linux-system-2.6.18-4-xen-vserver-686 Both described as "XEN system with Linux 2.6.18 image on i686." which seem to depend on linux

Re: Diff in update?

2006-10-12 Thread T
On Thu, 12 Oct 2006 01:45:39 +0200, Mihamina Rakotomandimby wrote: > Something "differential" has been introduced: "apt-get update" downloads > some kind of patches whose name contains date. > Would you please indicate me a link that explain the change that have > been made? http://xpt.sourceforg

Re: Diff in update?

2006-10-11 Thread Steve Kemp
On Thu, Oct 12, 2006 at 01:18:32AM +0200, Mihamina Rakotomandimby wrote: > I'am back now, and I see the way apt repo are dona is sloghtly > different. > Something "differential" has been introduced: "apt-get update" downloads > some kind of patches whose name contains date. > Would you please ind

Diff in update?

2006-10-11 Thread Mihamina Rakotomandimby
Hi, Six month ago, I used testing, and used to learn packaging for Debian on a testing box. I have been out for some mounths. I'am back now, and I see the way apt repo are dona is sloghtly different. Something "differential" has been introduced: "apt-get update" downloads some kind of patches whose

Re: Diff in update?

2006-10-11 Thread Kevin Mark
are made... > Thank you. Hi Mihamina, you can continue to produce Debian repositories in the same way. These new features were added to help reduce the size of Packages files over a modem. They implement some kind of 'diff' between the current file and some previous version. This feature

Diff in update?

2006-10-11 Thread Mihamina Rakotomandimby
Hi, Six month ago, I used testing, and used to learn packaging for Debian on a testing box. I have been out for some mounths. I'am back now, and I see the way apt repo are dona is sloghtly different. Something "differential" has been introduced: "apt-get update" downloads some kind of patches whose

Volcano heatsink+fan makes 10-20 degrees diff. with AMD

2006-01-24 Thread Hugo Vanwoerkom
Hi, After installing an AMD XP 2700+ the CPU seemed too hot all the time. I bought the processor and the heatsink/fan as a packaged deal. Then I bought an Thermaltake Extreme Volcano 12 80mm 2 Ball Cooling Fan. Turns out that makes a 10-20 degree difference! This shows it: http://img487.image

Re: diff in octave and octave-forge

2005-09-12 Thread Ramiro Aceves
roberto wrote: > Hi all, > i know two different packages (among others) are downloadable for math > computing: > octave and octave-forge > > i have installed and currently using octave 2.1.69 but what are the > differences with octave-forge?? > can i install octave-forge without conflict with octa

Re: diff in octave and octave-forge

2005-09-10 Thread Colin Ingram
roberto wrote: Hi all, i know two different packages (among others) are downloadable for math computing: octave and octave-forge i have installed and currently using octave 2.1.69 but what are the differences with octave-forge?? can i install octave-forge without conflict with octave 2.1? (apti

diff in octave and octave-forge

2005-09-09 Thread roberto
Hi all, i know two different packages (among others) are downloadable for math computing: octave and octave-forge i have installed and currently using octave 2.1.69 but what are the differences with octave-forge?? can i install octave-forge without conflict with octave 2.1? (aptitude says yes...)

Re: Apt-get error with package diff

2004-08-24 Thread Joris Huizer
[EMAIL PROTECTED] wrote: why Well, maybe you could copy the error in your email? Provide information about your system (is it woody/stable sarge/nearly-stable ??) and such ? Joris -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Re: Apt-get error with package diff

2004-08-23 Thread thelmap04
why

Re: what's the diff between 'make bzImage' and 'make zImage' while compiling kernel?

2004-07-18 Thread Greg Folkert
On Sun, 2004-07-18 at 04:07, cwinl wrote: > hi,all > > http://ertw.com/blog/archives/make_bzimage_vs_make_zimage-170404.html > > someone tell me that the kernel made by 'make bzImage' is smaller then > the one 'make zImage' made it. > > is it correct? No. zImage and bzImage use the same compres

Re: what's the diff between 'make bzImage' and 'make zImage' while compiling kernel?

2004-07-18 Thread Jon Dowland
On Sun, 18 Jul 2004 16:07:26 +0800, cwinl <[EMAIL PROTECTED]> wrote: > hi,all > > http://ertw.com/blog/archives/make_bzimage_vs_make_zimage-170404.html > > someone tell me that the kernel made by 'make bzImage' is smaller then the one 'make > zImage' made it. > > is it correct? Interesting art

what's the diff between 'make bzImage' and 'make zImage' while compiling kernel?

2004-07-18 Thread cwinl
hi,all http://ertw.com/blog/archives/make_bzimage_vs_make_zimage-170404.html someone tell me that the kernel made by 'make bzImage' is smaller then the one 'make zImage' made it. is it correct? -- P4/2.4B ELSA 528/128 512MB DDR333 240GB MSI 845PE BenQ FP557s Pioneer DVD-120A LG GCE-8320B --

Re: Copying a file from a floppy (diff formats)?

2004-07-11 Thread Kenward Vaughan
On Sun, Jul 11, 2004 at 07:52:32AM +0100, Ralph Bacolod wrote: > On Wed, Jul 07, 2004 at 07:12:06PM -0400, disciple wrote: > > I'm installing debian on my laptop. The laptop uses a winmodem. > > Downloaded the driver for it on my Windows box... XP (NTFS); ... The > > file that I downloaded is

Re: Copying a file from a floppy (diff formats)?

2004-07-10 Thread Ralph Bacolod
On Wed, Jul 07, 2004 at 07:12:06PM -0400, disciple wrote: > I'm installing debian on my laptop. The laptop uses a winmodem. > Downloaded the driver for it on my Windows box... XP (NTFS); ... The > file that I downloaded is a linux compressed file extension is > .gz. The exact file name

Re: Copying a file from a floppy (diff formats)?

2004-07-07 Thread Thomas Adam
--- disciple <[EMAIL PROTECTED]> wrote: > it in debian which showed it as .gz. It's probably a tar and a gzipped image. The "file" command can help you there. > Since I can see the file in debian, I should be able to extract and > install right? How do I get the file from the floppy disk

Copying a file from a floppy (diff formats)?

2004-07-07 Thread disciple
I'm installing debian on my laptop. The laptop uses a winmodem. Downloaded the driver for it on my Windows box... XP (NTFS); ... The file that I downloaded is a linux compressed file extension is .gz. The exact file name is pctel-0.9.7-9-rht-3.tar. This is interesting because in wind

Re: what's the diff between 'aptitude upgrade' and 'aptitude dist-upgrade'?

2004-07-05 Thread Silvan
> And dist-upgrade is for when you want to get all the new funky features. > Which many of us do :-). It only breaks things if the packages uploaded > by the maintainers are broken. Ok, that occasionally happens, which is > why you don't use "dist-upgrade" on your production servers except with >

Re: what's the diff between 'aptitude upgrade' and 'aptitude dist-upgrade'?

2004-07-05 Thread Simon Kitching
On Mon, 2004-07-05 at 21:02, Enrico Zini wrote: > On Mon, Jul 05, 2004 at 02:22:40AM -0500, dircha wrote: > > > An equally adequate reference is available as: > > /usr/share/doc/aptitude/README > > ...which is not too hard to paste: > > aptitude dist-upgrade > > This command will also attempt

Re: what's the diff between 'aptitude upgrade' and 'aptitude dist-upgrade'?

2004-07-05 Thread Enrico Zini
On Mon, Jul 05, 2004 at 02:22:40AM -0500, dircha wrote: > An equally adequate reference is available as: > /usr/share/doc/aptitude/README ...which is not too hard to paste: aptitude dist-upgrade This command will also attempt to upgrade packages, but it is more aggressive about solving depe

Re: what's the diff between 'aptitude upgrade' and 'aptitude dist-upgrade'?

2004-07-05 Thread dircha
cwinl wrote: hi all, i'm confused about several aptitude param. thank you all. I see that while dist-upgrade is documented in the aptitude documentation, it is not mentioned in the manual page. The aptitude manual page references the apt-get manual page ('man apt-get'). I suggest you take a look

what's the diff between 'aptitude upgrade' and 'aptitude dist-upgrade'?

2004-07-04 Thread cwinl
hi all, i'm confused about several aptitude param. thank you all. -- P4/2.4B ELSA 528/128 512MB DDR333 240GB MSI 845PE BenQ FP557s Pioneer DVD-120A LG GCE-8320B -- http://www.cwinl.com/ http://forum.lnnu.edu.cn/

Re: XML::Diff in Debian?

2004-06-23 Thread Greg Folkert
On Wed, 2004-06-23 at 04:30, Aaron Maxwell wrote: > On Tuesday 22 June 2004 12:41 am, William Ballard wrote: > > Am I correct in thinking XML::Diff from Perl: > > http://search.cpan.org/~sdether/XML-Diff-0.04/Diff.pm > > has not been packaged for Debian? > > I don&#

Re: XML::Diff in Debian?

2004-06-23 Thread Aaron Maxwell
On Tuesday 22 June 2004 12:41 am, William Ballard wrote: > Am I correct in thinking XML::Diff from Perl: > http://search.cpan.org/~sdether/XML-Diff-0.04/Diff.pm > has not been packaged for Debian? I don't think it has been packaged. apt-file and apt-cache turn up nothing, which m

XML::Diff in Debian?

2004-06-22 Thread William Ballard
Am I correct in thinking XML::Diff from Perl: http://search.cpan.org/~sdether/XML-Diff-0.04/Diff.pm has not been packaged for Debian? apt-file search Diff.pm only turns up Text::Diff and some other things. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe"

Re: performing diff on parts of a file

2004-06-15 Thread Micha Feigin
On Tue, Jun 15, 2004 at 02:23:11PM -0400, Kamaraju Kusumanchi wrote: > I am looking for a program/script(?) which performs diff on parts of a > file. Say I have a file of 100 lines. How to do diff on lines between > 20-30, and 50-60 without writing them into separate files. Which &

performing diff on parts of a file

2004-06-15 Thread Kamaraju Kusumanchi
I am looking for a program/script(?) which performs diff on parts of a file. Say I have a file of 100 lines. How to do diff on lines between 20-30, and 50-60 without writing them into separate files. Which software should I learn for this? sed/awk/perl? thanks for any ideas raju -- To

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread Ping Wing
SMP is for multiprocessor systems , non-SMP is for 1 processor.. thats it. :) cheers, http://www.axeltabs.com/ __ axel __ Do you Yahoo!? SBC Yahoo! - Internet access at a great low price. http://promo.yahoo.com/sbc/ -- To UNSUBSCRIB

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread stephen parkinson
cwinl wrote: Thank you !!! it works! i mistake debian for redhat. Thank you all! - Original Message - From: "Greg Madden" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Sunday, May 16, 2004 4:21 PM Subject: Re: what's the diff between non-SMP and SMP kernel

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread cwinl
Thank you !!! it works! i mistake debian for redhat. Thank you all! - Original Message - From: "Greg Madden" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Sunday, May 16, 2004 4:21 PM Subject: Re: what's the diff between non-SMP and SMP kernel? >

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread Greg Madden
; with message detail. > > > > - Original Message - > From: <[EMAIL PROTECTED]> > To: <[EMAIL PROTECTED]> > Cc: "debian- -user" <[EMAIL PROTECTED]> > Sent: Sunday, May 16, 2004 4:04 PM > Subject: Re: what's the diff between non-SMP and SMP kernel? &g

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread cwinl
i want to compile a kernel supporting SMP based on kernel-2.4.25. - Original Message - From: <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Cc: "debian- -user" <[EMAIL PROTECTED]> Sent: Sunday, May 16, 2004 4:04 PM Subject: Re: what's the di

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread cwinl
> To: <[EMAIL PROTECTED]> Cc: "debian- -user" <[EMAIL PROTECTED]> Sent: Sunday, May 16, 2004 4:04 PM Subject: Re: what's the diff between non-SMP and SMP kernel? > Simple - smp kernels support machines with more than one processor in > them. SMP kernels have

Re: what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread [EMAIL PROTECTED]
Simple - smp kernels support machines with more than one processor in them. SMP kernels have unneeded things compiled in if your machine, like most home systems, only has one processor it. cwinl wrote: > I'm compiling kernel-source-2.4.25. > I saw that it's different packages kernel-image-2.4.25-

what's the diff between non-SMP and SMP kernel?

2004-05-16 Thread cwinl
I'm compiling kernel-source-2.4.25. I saw that it's different packages kernel-image-2.4.25-1 and kernel-image-2.4.25-1-smp in the result of command 'apt-get install kernel-image-2.4.25' . I think that the original source package of kernel-2.4.25 must be the same,but i don't know what's the differ

Re: Apt-get error with package diff

2003-11-04 Thread Anim Asante
Try apt-get -f install and see if it fixes the problem. > -Original Message- > From: Karsten M. Self [mailto:[EMAIL PROTECTED] > Sent: 04 November 2003 12:33 > To: [EMAIL PROTECTED] > Subject: Re: Apt-get error with package diff > > > on Mon, Oct 27,

Re: Apt-get error with package diff

2003-11-04 Thread Karsten M. Self
on Mon, Oct 27, 2003 at 03:01:05PM +0100, Juan Pablo Valenzuela ([EMAIL PROTECTED]) wrote: > Hello: > my pc frezze in a middle of a dist-upgrade so i must to restart. Now the > apt-get doesn't work anymore... this is the message: > > # apt-get install diff > Readin

Apt-get error with package diff

2003-10-27 Thread Juan Pablo Valenzuela
Hello: my pc frezze in a middle of a dist-upgrade so i must to restart. Now the apt-get doesn't work anymore... this is the message: # apt-get install diff Reading Package Lists... Done Building Dependency Tree... Done The following packages will be upgraded diff 1 upgraded, 0 newly inst

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Monique Y. Herman
On Fri, 10 Oct 2003 at 16:40 GMT, Roberto Sanchez penned: > > Another way is to *always* run your source files (and have your > colleagues do the same) through indent before committing changes. Of > course, everyone needs to use the same options. This ensures > consistent formatting, regardless

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Monique Y. Herman
On Fri, 10 Oct 2003 at 16:26 GMT, Nori Heikkinen penned: > > but (a) this is Java code; and (b) indent looks like it has so many > tweakable options that to find every single preference the original > coder used would take way too much reformatting, checking in, diffing >=2E.. i'd just like to tur

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Nori Heikkinen
dman, you rock as usual. on Fri, 10 Oct 2003 12:33:17PM -0400, Derrick 'dman' Hudson insinuated: > On Fri, Oct 10, 2003 at 09:48:34AM -0400, Nori Heikkinen wrote: > | hey all, > | > | this is kind of off-topic, but i figured this is the community most > | likley to have dealt with this sort of th

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Alex Malinovich
On Fri, 2003-10-10 at 11:28, Nori Heikkinen wrote: > on Fri, 10 Oct 2003 12:06:07PM -0400, Mental Patient insinuated: > > Nori Heikkinen wrote: > [...] > > >now it's time to check it into CVS. i don't want every single line > > >to show up as different just because of tab characters, so i need > >

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Bill Moseley
On Fri, Oct 10, 2003 at 09:48:34AM -0400, Nori Heikkinen wrote: > is there some way to open the file in emacs (in which i assumer it was > originally written; i use vim) and run it through a re-indentder with > hard tabs on? or could i do this in vim? In case this was not mentioned... Also for y

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Alan Shutko
Nori Heikkinen <[EMAIL PROTECTED]> writes: > now it's time to check it into CVS. Here's what I do in similar situations. Do a diff between your work file and the latest in CVS with diff -cb (or diff -ub, according to preference). The -b ignores changes in whitespace. Then

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Mental Patient
code before working on it, and now I only want to commit the actual code changes. How do I do that?", right? I'm not sure how well this would work, but you could try something like this: Checkout the original, unaltered file you started with. Do a diff -uNrw originalfile newfile > c

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Roberto Sanchez
Mental Patient wrote: I've done this with mixed results. In general if you're going to work on projects, its a good idea to come up with your format conventions first. :) However, sometimes you just inherit code and really there isnt much you can do about it. Its right up there with cuddled els

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Derrick 'dman' Hudson
On Fri, Oct 10, 2003 at 09:48:34AM -0400, Nori Heikkinen wrote: | hey all, | | this is kind of off-topic, but i figured this is the community most | likley to have dealt with this sort of thing in the past, and be | opinionated about it. | | i've been editing a lot of code over the past few month

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Nori Heikkinen
on Fri, 10 Oct 2003 12:06:07PM -0400, Mental Patient insinuated: > Nori Heikkinen wrote: [...] > >now it's time to check it into CVS. i don't want every single line > >to show up as different just because of tab characters, so i need > >to find a good solution on how to transform my indents back i

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Nori Heikkinen
on Fri, 10 Oct 2003 11:44:14AM -0400, Roberto Sanchez insinuated: > Nori Heikkinen wrote: [...] > >now it's time to check it into CVS. i don't want every single line > >to show up as different just because of tab characters, so i need > >to find a good solution on how to transform my indents back

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Colin Watson
On Fri, Oct 10, 2003 at 09:48:34AM -0400, Nori Heikkinen wrote: > i've been editing a lot of code over the past few months that was > originally saved to disk with hard tabs for indenting. i can't work > with hard tabs, and so managed to reformat the entire thing to use > spaces (basically a "s,^I

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Mental Patient
Nori Heikkinen wrote: hey all, this is kind of off-topic, but i figured this is the community most likley to have dealt with this sort of thing in the past, and be opinionated about it. i've been editing a lot of code over the past few months that was originally saved to disk with hard tabs for in

Re: [OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Roberto Sanchez
Nori Heikkinen wrote: hey all, this is kind of off-topic, but i figured this is the community most likley to have dealt with this sort of thing in the past, and be opinionated about it. i've been editing a lot of code over the past few months that was originally saved to disk with hard tabs for in

[OT] CVS diff: hard vs. soft tabs

2003-10-10 Thread Nori Heikkinen
hey all, this is kind of off-topic, but i figured this is the community most likley to have dealt with this sort of thing in the past, and be opinionated about it. i've been editing a lot of code over the past few months that was originally saved to disk with hard tabs for indenting. i can't wor

Re: Diff btw GeForce4 and RIVA TNT2?

2003-10-03 Thread Hugo Vanwoerkom
From: Ron Johnson ([EMAIL PROTECTED]) Subject: Re: Diff btw GeForce4 and RIVA TNT2? >> Quod erat demonstrandum! >The nvidia-using-TNT2 will *smoke* the nv-using-GeForce4. Unfortunately with Backstreet Ruby I cannot mix nvidia and nv, so both the figures are with nvidia. Unfortunatel

Re: Diff btw GeForce4 and RIVA TNT2?

2003-10-02 Thread Ron Johnson
On Thu, 2003-10-02 at 08:59, Hugo Vanwoerkom wrote: > Hi all! > > Thanks for those answers! > > So... apt-getted xscreensaver-gl. gears -fps -delay 0 > indeed is the most straightforward app. to show the > difference. > > Left monitor, with the GeForce4: 155 fps. > Right monitor, with RIVA TNT2:

Re: Diff btw GeForce4 and RIVA TNT2?

2003-10-02 Thread Hugo Vanwoerkom
Hi all! Thanks for those answers! So... apt-getted xscreensaver-gl. gears -fps -delay 0 indeed is the most straightforward app. to show the difference. Left monitor, with the GeForce4: 155 fps. Right monitor, with RIVA TNT2: 50 fps. Quod erat demonstrandum! Hugo _

Re: Diff btw GeForce4 and RIVA TNT2?

2003-10-01 Thread Ron Johnson
On Wed, 2003-10-01 at 12:42, David Z Maze wrote: > Hugo Vanwoerkom <[EMAIL PROTECTED]> writes: > > > The monitors are samsungs 17" but the cards are > > different: one is a RIVA TNT2 Model 64/Model 64 and > > the other a GeForce4 MX 440 AGP 8x. > > > > I notice no difference between the 2 other th

Re: Diff btw GeForce4 and RIVA TNT2?

2003-10-01 Thread David Z Maze
Hugo Vanwoerkom <[EMAIL PROTECTED]> writes: > The monitors are samsungs 17" but the cards are > different: one is a RIVA TNT2 Model 64/Model 64 and > the other a GeForce4 MX 440 AGP 8x. > > I notice no difference between the 2 other than that I > paid $25 more for the MX440. The last time I boug

Re: Diff btw GeForce4 and RIVA TNT2?

2003-10-01 Thread Joerg Johannes
On Wednesday 01 October 2003 17:00, Hugo Vanwoerkom wrote: > Hi all! > > I have Backstreet Ruby installed so I have 2 monitors > with kbds/mice that each have a user. > > The monitors are samsungs 17" but the cards are > different: one is a RIVA TNT2 Model 64/Model 64 and > the other a GeForce4 MX

Diff btw GeForce4 and RIVA TNT2?

2003-10-01 Thread Hugo Vanwoerkom
Hi all! I have Backstreet Ruby installed so I have 2 monitors with kbds/mice that each have a user. The monitors are samsungs 17" but the cards are different: one is a RIVA TNT2 Model 64/Model 64 and the other a GeForce4 MX 440 AGP 8x. I notice no difference between the 2 other than that I paid

Re: diff arguments for building diff for dpkg-source

2003-09-30 Thread Rene Engelhard
Hi, Micha Feigin wrote: > Currently I am trying to build the diff for the source trio > (orig.tar.gz/diff.gz/.dsc). The problem is that using the standard diff > arguments diff -ruN doesn't work. dpkg-source -x returns an error for > the diff line (the first one in the file)

Re: diff arguments for building diff for dpkg-source

2003-09-30 Thread Colin Watson
On Tue, Sep 30, 2003 at 08:35:11PM +0300, Micha Feigin wrote: > I am trying to build my own version of a package and I am trying to > reuse the existing package files since I don't know how to create them > myself. > Currently I am trying to build the diff for the source tr

diff arguments for building diff for dpkg-source

2003-09-30 Thread Micha Feigin
I am trying to build my own version of a package and I am trying to reuse the existing package files since I don't know how to create them myself. Currently I am trying to build the diff for the source trio (orig.tar.gz/diff.gz/.dsc). The problem is that using the standard diff arguments diff

Re: using diff command

2003-03-19 Thread Curtis Vaughan
ation has been added since yesterday. So, I would think that "diff File2 File1" should provide me with that information. But all I ever get is a message that the files differ. I have tried with various arguments, but no luck. Does the message you get actually say: "*Binary* f

Re: using diff command

2003-03-18 Thread Colin Watson
On Tue, Mar 18, 2003 at 02:55:26PM -0800, Curtis Vaughan wrote: > I must be really stupid, so forgive me, but I can't figure out for the > life of me how to use the diff command. I've read the man pages and > looked at some stuff on the internet, but I can't get it to do

Re: using diff command

2003-03-18 Thread Michael Wardle
On Tue, 18 Mar 2003 14:55:26 -0800 Curtis Vaughan <[EMAIL PROTECTED]> wrote: > I must be really stupid, so forgive me, but I can't figure out for the > > life of me how to use the diff command. I've read the man pages and > looked at some stuff on the internet, but

Re: using diff command

2003-03-18 Thread Alan Shutko
Curtis Vaughan <[EMAIL PROTECTED]> writes: > So, I would think that "diff File2 File1" should provide me with > that information. But all I ever get is a message that the files > differ. In general, it's helpful to show exactly what you typed and what the error m

Re: using diff command

2003-03-18 Thread Vineet Kumar
* Curtis Vaughan <[EMAIL PROTECTED]> [20030318 15:24 PST]: > I must be really stupid, so forgive me, but I can't figure out for the > life of me how to use the diff command. I've read the man pages and > looked at some stuff on the internet, but I can't get it to do

Re: using diff command

2003-03-18 Thread Cameron Hutchison
ormation has been added since yesterday. So, I would > think that "diff File2 File1" should provide me with that information. > But all I ever get is a message that the files differ. I have tried > with various arguments, but no luck. Does the message you get actually s

Re: using diff command

2003-03-18 Thread Gary Hennigan
"Gary Hennigan" <[EMAIL PROTECTED]> writes: [snip] > Hmm. You got somethin' funky going on! What you describe should only > happen if you're specifying the "-q" or "--brief" option to diff. What > does "diff --version" give you? Ma

Re: using diff command

2003-03-18 Thread nate
Curtis Vaughan said: > Both are text files. File1 was File2 a day ago. Since then File2 has had > additional information tagged on to it (it's a log file). All I want to > see is what information has been added since yesterday. So, I would > think that "diff File2 File1&q

Re: using diff command

2003-03-18 Thread Gary Hennigan
"Curtis Vaughan" <[EMAIL PROTECTED]> writes: > I must be really stupid, so forgive me, but I can't figure out for the > life of me how to use the diff command. I've read the man pages and > looked at some stuff on the internet, but I can't get it to do wh

using diff command

2003-03-18 Thread Curtis Vaughan
I must be really stupid, so forgive me, but I can't figure out for the life of me how to use the diff command. I've read the man pages and looked at some stuff on the internet, but I can't get it to do what I want it to do. But then maybe it doesn't do what I want it to

Re: how to apply diff file

2003-03-13 Thread David Z Maze
rce). > > last i checked apt-get source automatically extracted and patched > the source with the diff, you can see if this is the case by checking > to see if there is a debian/ directory within the extracted source tree > of the app you apt-get source'd. > > in any case, the u

Re: how to apply diff file

2003-03-12 Thread nate
omatically extracted and patched the source with the diff, you can see if this is the case by checking to see if there is a debian/ directory within the extracted source tree of the app you apt-get source'd. in any case, the usual command to use with a diff is patch, be sure to decompress i

how to apply diff file

2003-03-12 Thread mtsouk
Hello to everyone. I have downloaded the source file of an application (apt-get source appl). Along with the .tar.gz file, I got and diff.gz file which I don't know how to apply it to the .tar.gz file (after the extract of cource). Can you please help me? TIA, Mihalis. - :wq -- To UNSUBS

Re: Applying Debian diff to a newer upstream tar ball.

2003-03-07 Thread David Z Maze
newer upstream tar ball was only slightly different > from Debian's (old) .orig.tar.gz. > Anyway, what I did was: > > 1. gunzip -c nut_1.2.1-2.diff.gz > nut_1.2.1-2.diff > 2. tar -xzf nut-1.2.2-pre2.tar.gz > 3. (cd nut-1.2.2; ./configure) > 3. patch --verbose -p1

Applying Debian diff to a newer upstream tar ball.

2003-03-07 Thread Shaul Karl
(old) .orig.tar.gz. Anyway, what I did was: 1. gunzip -c nut_1.2.1-2.diff.gz > nut_1.2.1-2.diff 2. tar -xzf nut-1.2.2-pre2.tar.gz 3. (cd nut-1.2.2; ./configure) 3. patch --verbose -p1 -d nut-1.2.2 < nut_1.2.1-2.diff -- Shaul Karl, [EMAIL PROTECTED] e t -- To UNSUBSCRIB

Conflict when adding eth1 (diff, gateway 2) dhcp

2003-02-24 Thread Jonas Persson
Hi, i have a nice little problem of mine. My router at home has 3 nics. 2 external and 1 internal for my local lan. Eth0 has my Fixed Adsl Connection 194.236.xx.xx adress Eth1 has my Cable Modem Connection (dynamic address) Eth2 has my local lan connection. 192.168.110.1 address Everything is jus

<    1   2   3   4   >