From owner-freebsd-hackers Wed Sep 2 07:31:04 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id HAA27598 for freebsd-hackers-outgoing; Wed, 2 Sep 1998 07:31:04 -0700 (PDT) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from arjun.niksun.com (gw.niksun.com [206.20.52.122]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA27579 for ; Wed, 2 Sep 1998 07:31:01 -0700 (PDT) (envelope-from ath@niksun.com) Received: from stiegl.niksun.com (stiegl.niksun.com [10.0.0.44]) by arjun.niksun.com (8.8.8/8.8.8) with ESMTP id KAA23663 for ; Wed, 2 Sep 1998 10:43:21 -0400 (EDT) Received: from stiegl.niksun.com (localhost.niksun.com [127.0.0.1]) by stiegl.niksun.com (8.8.7/8.8.7) with ESMTP id KAA04745 for ; Wed, 2 Sep 1998 10:29:51 -0400 (EDT) (envelope-from ath@stiegl.niksun.com) Message-Id: <199809021429.KAA04745@stiegl.niksun.com> X-Mailer: exmh version 2.0zeta 7/24/97 From: Andrew Heybey To: freebsd-hackers@FreeBSD.ORG Subject: cvsup questions Date: Wed, 02 Sep 1998 10:29:51 -0400 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG I want to be able to make local changes to the FreeBSD source tree, check them in on a branch into a local copy of the repository, and then merge FreeBSD updates with my changes as necessary. I have cvsup'd the repository, but after reading the documentation I have a couple of questions: The "Blurb" file that comes with cvsup says: - A client who uses CVSup to maintain a CVS repository can check in local modifications, without interference from CVSup. CVSup will bring in new revisions, tags, and branches from the server, without disturbing revisions, tags, and branches that were created locally. This is possible because CVSup parses and understands RCS files. Of course, for this to work, the revision numbers must not collide. This (above) is exactly what I want to do. However, the "Announce" file says: > CVSup is able to merge new deltas and tags from the server with deltas > and tags added locally on the client machine. This makes it possible > for the client to check local modifications into his repository > without their being obliterated by subsequent updates from the server. > Note: Although this feature is fully implemented in CVSup, it will > probably not be practical to use it until some small changes have been > made to CVS. which seems to contradict the above paragraph. Is the second paragraph out of date, or does it mean something slightly different (maybe the second paragraph is talking about merging changes made locally on the *same* branch as the deltas coming from the server?), or am I otherwise confused? Second question: The cvsup man page says about the "delete" keyword: In exact mode, CVSup verifies every edited file with a checksum, to ensure that the edits have produced a file identical to the master copy on the server. If the checksum test fails for a file, then CVSup falls back upon transferring the entire file. This seems to imply to me that I *don't* want to set the "delete" keyword because if I make local changes that cvsup will at best get confused and at worst copy the server's file on top of my version. But the handbook says about the "delete" keyword: You should always specify this, so that CVSup can keep your source tree fully up to date. without any exceptions such as "unless you are making local changes". Is cvsup smart enough to deal with local changes even when in exact mode? thanks, andrew To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message