(no subject)

[root]

>From address@hidden  Thu Feb 15 00:45:22 2001
>Return-Path: <address@hidden>
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164])
        by gateway.camelot.jp (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
AAA23928
        for <address@hidden>; Thu, 15 Feb 2001 00:45:20 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T44K-0003BD-00; Wed, 14 Feb 2001 10:42:12 -0500
Received: from [216.200.203.33] (helo=mail.openave.com)
        by fencepost.gnu.org with smtp (Exim 3.16 #1 (Debian))
        id 14T423-00035V-00
        for <address@hidden>; Wed, 14 Feb 2001 10:39:51 -0500
Received: from openavenue.com
          (adsl-63-205-189-231.dsl.snfc21.pacbell.net [63.205.189.231])
          by mail.openave.com (Post.Office MTA v3.5.3 release 223
          ID# 0-61060U3000L300S0V35) with ESMTP id com;
          Wed, 14 Feb 2001 07:39:49 -0800
Message-ID: <address@hidden>
From: "Derek R. Price" <address@hidden>
Organization: Open Avenue
X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.17-14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Laine Stump <address@hidden>
CC: TC <address@hidden>, address@hidden
Subject: Re: Respository crashed, sandbox is from old Repository BUT is more 
 current than restored CVS
References: <address@hidden> <address@hidden>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: address@hidden
Errors-To: address@hidden
X-BeenThere: address@hidden
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:address@hidden>
List-Post: <mailto:address@hidden>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Id: Announcements and discussions for the CVS version control system 
<info-cvs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Archive: <http://mail.gnu.org/pipermail/info-cvs/>
Date: Wed, 14 Feb 2001 10:39:48 -0500
Status: O
Content-Length: 2794
Lines: 60

The easiest way to do this is a fresh checkout and copying everything that 
_isn't_ in a CVS directory from the old workspace.  Then let CVS do the work of
determining what has changed and what hasn't as usual.

I've actually been known to handle this by copying all the CVS directories from 
the freshly checked out workspace into the old one and performing a checkin in
the old one since it's easier to write the find command, but if you're going to 
do this, be absolutely sure you've backed up your old workspace first.  This
means working on the backup!

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
"I tried to think but nothing happened!"
            - Curly

Laine Stump wrote:

> "TC" <address@hidden> writes:
>
> > in line
> > >> So the CVS repository box died, restored backup to a new box but it
> > >> is about 2 days old, but THEY changed the repository name/server/ &
> > >> logins..  I want to sync up again,

>
> So you're saying that your backup is two days old, and there are
> changes you had updated to your local directory that aren't in the
> restored repository? In that case, you have two sets of valuable info in your 
> workdirectory, and they key to it *all* is in your existing CVS/Entries files:
>
> 1) Files for which your CVS/Entries shows a newer revision than what
>    is in the restored repository - your workdir contains a revision of
>    that file that was lost when you lost your old machine.
>
>    You should rite a script to shuffle through and find all these
>    files, (or maybe even cvs -n update will report it to you as an
>    error), and either commit the files you have (if you're 100%
>    certain you didn't have any local mods to that file), or merge in
>    the changes by hand. Do all this work in a newly checked-out work
>    directory.
>
> 2) Files for which your CVS/Entries file shows a revision that *does*
>    exist in the repository, but "cvs -n update" shows that the file
>    has been locally modified. In this case, you can just do a "cvs update"
>    and continue working as if nothing had happened.
>
> Note that you should not perform *ANY* cvs operations on your old work
> directory without also giving "-n" on the commandline (eg "cvs -n
> update") until after you've taken care of step 1. After that, if you
> still receive any errors, you may need to tweak a few rev numbers in
> your Entries files by hand (if more than one revision was lost).
>
> Do not *at any cost* destroy your existing CVS/Entries by copying over
> the Entries file from a different workdir!!!


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs