RE: What does "is present in revision" mean

[Keith Beattie]

> From: 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.

Hmmm, in that case I usually see the error/warning
  "cvs update: file foo.bar exists, but has been added in revision tag2"
When doing merges, I grep stderr for ", but has been" to look for just this
case and the reverse (when modified on the Trunk and removed on the branch).

In the above case, the file doesn't exist on the Trunk so there isn't a
revision to compare it against.  It looks like cvs up -j -j is
distinguishing between adding a new file and resurrecting it from a dead
revision.  In the case of a reserection I would think that it should just do
a a 'cvs add' would do in that case and be done with it.

I'll add grep'ing for "is present in" to my merge routine, but unless there
is a case in here somewhere that requires resolving by a human - this looks
like a bug to me.

ksb