[web-team] modified/unlocked RCS files

[Tim Utschig]

On Tue, May 20, 2008 at 08:38:37PM -0700, Mark Weisler wrote:
> mark at svlug:/home/httpd/html/teams$ co -l web-team.php
> RCS/web-team.php,v  -->  web-team.php
> revision 1.1 (locked)
> writable web-team.php exists, and you do not own it; remove it?
> [ny](n): 
> -----
> I have postponed making a change because I don't want to remove
> it.  Would someone kindly suggest how this situation is to be
> handled.  I would experiment on my own system but I think I'll
> ask here in this case.

I remember Rick covering this situation before, but I can't find
his message at the moment.  This should do the trick:

  # jot down who owns, just in case
  ls -l web-team.php
  
  # check if there are changes other than your own
  rcsdiff web-team.php
  
  # create a backup copy of the changed file
  cp web-team.php web-team.php.2008-05-20
  
  # answer "y" when asked about removing it
  co -l web-team.php
  
  # overwrite the latest RCS copy with the changed copy
  cat web-team.php.2008-05-20 > web-team.php
  
  # check in as usual, mentioning in your log message any other
  # changes you saw, if any
  ci -u web-team.php

-- 
   - Tim Utschig <tim at tetro.net>