nathan wagner <[EMAIL PROTECTED]> writes:

> I'm not familiar with cvs, and the man page was less than clear.  It seems
> that i need to do 'cvs rdiff -R -u -D ...' but i'm not sure what release to
> specify.  Or perhaps i do 'cvs diff', but that doesn't get a context diff.

Actually, I meant to elaborate a little more, but forgot.  For single
files, cvs diff -u works OK, but to submit a bigger patch, I'd
recommend using makepatch.  I keep two checked out trees on my system.
My working one, and a completely pristine, untouched tree.  Then when
I'm ready to generate a patch, I update both trees via "cvs -z3 update
-Pd", and then I use makepatch.  There's a Debian package, or you can
get the upstream source from
ftp.debian.org:/pub/debian/dists/unstable/main/source/utils/makepatch*.tar.gz.

The script I use is:

  #!/bin/bash

  UPSTREAM=upstream
  WORKING=working

  set -e

  cd ~/gnucash
  rm -f gnucash.diff.gz gnucash.diff.gz.uue
  find -name ".#*" | xargs rm -f
  makepatch --diff "diff -u" --exclude-vc ${UPSTREAM} ${WORKING} > gnucash.diff
  gzip -9vf gnucash.diff
  uuencode gnucash.diff.gz < gnucash.diff.gz > gnucash.diff.gz.uue

  exit $?

> Is there a way to get cvs to preserve the timestamps on the files it pulls
> to my machine?

What timestamps?  What is it you're trying to do?  There may be a
better way to accomplish it...

> For my own sanity i would like to update the RPM spec file in the CVS tree
> as well.  Does the CVS version have a version number?  1.3?  1.3.0?

I'm not sure exactly what you mean, but yes, CVS has a version for
every file.  Whether it stores it in the file or not depends both on
what flags you have set for that file, and whether or not you put a
$Id$ variable reference in the file...

-- 
Rob Browning <[EMAIL PROTECTED]> PGP=E80E0D04F521A094 532B97F5D64E3930
----- %< -------------------------------------------- >% ------
The GnuCash / X-Accountant Mailing List
To unsubscribe, send mail to [EMAIL PROTECTED] and
put "unsubscribe gnucash-devel [EMAIL PROTECTED]" in the body

Reply via email to