Re: Diffing to current cvs (was Re: Lyrics)

2006-02-08 Thread Daniel Stenberg

On Wed, 8 Feb 2006, Burelli Luca wrote:

Side note: anyone knows if/how to change the diff command used by cvs? I'd 
love to have cvs diff call vimdiff, but haven't managed to find out how.


You don't, cvs uses an internal diff. But you can easily extract two versions 
from cvs and run whatever diff tool you like on them. I believe tortoisecvs 
and similar GUI tools offer this service more or less built-in.


--
 Daniel Stenberg -- http://www.rockbox.org/ -- http://daniel.haxx.se/


Re: Diffing to current cvs (was Re: Lyrics)

2006-02-08 Thread Manuel Dejonghe
On 2/8/06, Daniel Stenberg [EMAIL PROTECTED] wrote:
 On Wed, 8 Feb 2006, Burelli Luca wrote:

  Side note: anyone knows if/how to change the diff command used by cvs? I'd
  love to have cvs diff call vimdiff, but haven't managed to find out how.

 You don't, cvs uses an internal diff. But you can easily extract two versions
 from cvs and run whatever diff tool you like on them. I believe tortoisecvs
 and similar GUI tools offer this service more or less built-in.

Jup.
First time you ask tortoise to diff, it asks you for a diff tool binary.
Wincvs as well is able to take another differ, but may not be suitable
if you've been  speaking about vimdiff.


lImbus



Re: Diffing to current cvs (was Re: Lyrics)

2006-02-08 Thread Burelli Luca

On Wed, 8 Feb 2006, Manuel Dejonghe wrote:

 On 2/8/06, Daniel Stenberg [EMAIL PROTECTED] wrote:
  On Wed, 8 Feb 2006, Burelli Luca wrote:
 
   Side note: anyone knows if/how to change the diff command used by cvs? I'd
   love to have cvs diff call vimdiff, but haven't managed to find out how.
 
  You don't, cvs uses an internal diff. But you can easily extract two
  versions from cvs and run whatever diff tool you like on them. I
  believe tortoisecvs and similar GUI tools offer this service more or
  less built-in.

 Jup. First time you ask tortoise to diff, it asks you for a diff tool
 binary. Wincvs as well is able to take another differ, but may not be
 suitable if you've been speaking about vimdiff.


Hehe, you got my point... yes, I like vim a lot, but I'm not yet so
die-hard to use it also in Windows. [Although I might start, now that you
mention it... ;) ]
Thanks for the replies, no worries, nothing that a nice bash script can't
handle.

Luca


Re: Diffing to current cvs (was Re: Lyrics)

2006-02-08 Thread David Bleakley
Thanks for your comments. However I am still stuggling to get diff working.An example in http://www.rockbox.org/twiki/bin/view/Main/UsingCVSwould really help me.I can login  cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/rockbox login  Enter for passwordNone of the following seem to work  cvsdiff -u apps/lang/english.lang C:\english.lang  testdiff.txt cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/rockbox diff -u apps/lang/english.lang C:\english.lang  testdiff.txt cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/rockbox diff -u rockbox/apps/lang/english.lang C:\english.lang  testdiff.txt I must be doingsomething wrongT!
 hanks
 David
		Win a BlackBerry device from O2 with Yahoo!. Enter now.