[cvsnt] Re: Update Merge removes files

[Stuart Stevens]

Tony

I am not using the "-r" option of the "update" command.  

I am using the merge option with two tags for the CVS update command.  The
first tag was the branch itself while the second tag was a tag used on four
files.  So the update command is supposed to merge the differences between
the tags.  When the first tag exists and the second does not, CVS assumes
that the file is to be removed?  This would appear to be expected behavior. 

If the second tag exists and the first does not, is the file replaced?

Thanks
Stuart


-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of
Tony Hoyle
Sent: Saturday, May 15, 2004 3:58 AM
To: cvsnt at cvsnt.org
Subject: [cvsnt] Re: Update Merge removes files

Stuart Stevens wrote:


> I have been trying to reproduce what I believe was incorrect behavior.  
> Was this a possible bug or is there some combination of the update 
> merge which will "remove" files without the merge tags?
> 
If you use -r instead of -j it'll remove the files with no tag.  -j won't do
this.

Tony