From: Beman Dawes (bdawes_at_[hidden])
Date: 2002-03-18 07:11:53
At 08:19 PM 3/16/2002, Petr Kocmid wrote:
>the changed doc file libs/graph/doc/isomorphism_impl.pdf cannot merge
>is resulting to conflict in cvs update. The workaround is to erase
>an old local copy, but more permanent solution is to mark the file as
>in cvs repository.
>How could this be done quickly? Login to cvs, switch to appropriate
>cvs admin -kb isomorphism_impl.pdf
>cvs update -A isomorphism_impl.pdf
>or, just in case no admin available:
>cvs remove isomorphism_impl.pdf
>cvs add -kb isomorphism_impl.pdf
>I am posting this to list, not private because this kind of problem
>repeating time to time again and I hope it could be helpful to have a
>solution ready in archives.
Unless they are static and never change, it is much better to keep binary
files out of the CVS repository. Each new version of a binary file
essentially requires archiving the entire file. That markedly increases
the size of the repository, which is a hardship for those to download the
repository backup over the Internet.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk