Re: The cvs update feature

[Mark D. Baushke]

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

Daniel Sadoc <address@hidden> writes:

> Hi people,
> 
> Please, I would like to know if there is a way to disable the "cvs
> update" feature.

No.

> I think that in many cases the "merge" is very dangerous, specially
> when people do it mechanically without running, for instance, "cvs
> log" first. 

The original, unmodified file is still in the updated directory after
the primary file has been patched. It is called
.#<filename>.<old-revision> in the same directory as the <filename>
file.

> But I don't know if disabling "cvs update" is the best solution in
> order to guarantee the consistency.

cvs works fine. If it does not do what you expect, then it may be you
are attempting to use the wrong tool or have misconfigured it for some
file types that do not lend themselves to being merged by diff3. For
those file types you might consider updates to the CVSROOT/cvswrappers
file.

> Are there other possibilities in order to avoid pitfalls?

Consider reading the manual. Consider asking a question that actually
provides your readers with sufficient understanding about why a cvs
update is considered dangerous by you.

You could consider some tool other than cvs.

        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFBc92N3x41pRYZE/gRAkDqAJ4poyo5CqXAYjnnPExjkEmBG3s56QCgtKZT
c13YoD5JQjwTGuu2DJzekFE=
=5vq3
-----END PGP SIGNATURE-----