Re: cvs update

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Jørgensen wrote:

> Very nice comments... It all makes sense suddenly. You know, most of the
> time I *want* to overwrite my local garbage... Actually I hate those .#
> filenames... Any way to avoid them, when I'm sure that I don't want them?

I don't think so. They're a safety feature, really - it makes sure you
don't accidentally trash any of your valuable local changes. 'del /s
.#*' will remove them.

> I was also interested in finding out how to resolve the conflict
> supposing that the file actually was important.... Something about this
> diff-utility, right?
CVS will insert conflict markers that look something like this:

<<<<<<< filename
text that's in your local copy
=======
conflicting text in the repository
>>>>>>> CVS revision number in the repository

Just search for the '<<<<<<<' string, and examine the two sets of
changes, keeping the one you want.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFECKQnLdDyDwyJw+MRAhAZAKDODqgZXTyitGmLiA6qr0eefPtsDACeIi2L
jkuKmmZtbDObpkXBa5Madqw=
=jPkb
-----END PGP SIGNATURE-----