Re: What does "is present in revision" mean

[Derek R. Price]

Keith Beattie wrote:

> Hi all,
>
> Short question:
> What does the stderr message: 'cvs update: file foo.bar is present in
> revision tag2' mean when doing a  'cvs up -j tag1 -j tag2'?

I think that message is a conflict notice that your merge attempted to add a
file that was already present on the destination branch.  In other words, the
file was added on both branches and CVS doesn't know how to resolve the
conflict.  Look at both revisions and decide for yourself.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden         CollabNet ( http://collab.net )
--
82. Hold a hard drive to your ear -- listen to the C.