From owner-freebsd-hackers Thu Oct 3 08:13:41 1996 Return-Path: owner-hackers Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id IAA02144 for hackers-outgoing; Thu, 3 Oct 1996 08:13:41 -0700 (PDT) Received: from austin.polstra.com (austin.polstra.com [206.213.73.10]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id IAA02137 for ; Thu, 3 Oct 1996 08:13:36 -0700 (PDT) Received: from austin.polstra.com (jdp@localhost) by austin.polstra.com (8.7.6/8.7.3) with ESMTP id IAA17336; Thu, 3 Oct 1996 08:12:58 -0700 (PDT) Message-Id: <199610031512.IAA17336@austin.polstra.com> To: Khetan Gajjar cc: hackers@freebsd.org Subject: Re: Possibly smoked my cvs tree :-( In-reply-to: Your message of "Sat, 03 Oct 1996 12:30:24 +0200." Date: Thu, 03 Oct 1996 08:12:58 -0700 From: John Polstra Sender: owner-hackers@freebsd.org X-Loop: FreeBSD.org Precedence: bulk > >If you have some "extra" files in your tree that should not be > >there at all, CVSup won't remove them. Like sup, it will only > > I presume those extra files are those files not defined by CVS at all ? Yes, exactly. For example, suppose you originally maintained your repository with sup or CTM, and you kept it up-to-date until 6 months ago. Now you decide to update your repository using CVSup. Any files in the master repository that were deleted during the last 6 months (not just moved into the Attic, but totally deleted) will be left undeleted when you run CVSup. Since this is your first run of CVSup, it has no record that those files previously existed in the repository. It knows nothing about them, and so it leaves them alone. (Maybe one of them is a letter from Mom.) Normally, files in the master repository don't get totally deleted -- they always remain, either in the Attic or in the live part of the repository. But it does happen every now and then. Usually, it happens because somebody made a mistake. E.g., somebody accidentally imports a bunch of stuff into the wrong place, and then moves it to the right place or deletes it again. (Lest anybody misunderstand, committers are not supposed to do things like that. Such repairs should be done by Peter Wemm, or at least cleared with him first.) I am planning on adding an "exact" mode to CVSup, for dealing with your kind of situation. In exact mode, CVSup will do whatever is necessary in order to make your local repository an exact mirror of the remote one. That will include deleting any extraneous files that it finds. If I can just massage it into working within the limitations of %&#@!* SOCKS first ... :-( John -- John Polstra jdp@polstra.com John D. Polstra & Co., Inc. Seattle, Washington USA "Self-knowledge is always bad news." -- John Barth