Re: [boost] [CVS} WinCVS questions

From: Beman Dawes (beman_at_[hidden])
Date: 2000-09-27 19:39:41

At 05:47 PM 9/27/2000 -0400, David Abrahams wrote:

 >Just delete the file in question from your local directory and update
 >again.

Yes, that works.  Darin Adler also suggested that in private email.

 >If you want to use the WinCVS UI, select the file and use ctl-Backspace 
or
 >Menu: Modify/Erase Selection

I was afraid to try that for fear it would erase the file in the repository 
too.  But I guess that's what Modify/Remove does.

 >> *  After an "update" of all the files in a directory, none of which had
 >> been modified in the working directory, some of them are given a status 

 >of
 >> "Mod file" and the icon is changed to bright red.  Furthermore, a file 
is
 >> created with a name in the form .#original.html.1.2 which is the 
original
 >> contents of original.html.  A diff of the two files shows them to be 
the
 >> same.  What has happened and how do I fix it?
 >
 >If you had originally retrieved the files on a branch and you didn't 
select
 >the "Reset any sticky tag/date/-k options box" (-A commandline option) 
the
 >system may have tried to merge the changes together... there's a status
 >column that tells you a little more about the file. Does it say "result 
of
 >merge"?

Yes, so that may have been what happened.

Thanks,

--Beman