From owner-freebsd-hackers Thu Oct 1 10:59:27 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA00925 for freebsd-hackers-outgoing; Thu, 1 Oct 1998 10:59:27 -0700 (PDT) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from florence.pavilion.net (florence.pavilion.net [194.242.128.25]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA00911 for ; Thu, 1 Oct 1998 10:59:21 -0700 (PDT) (envelope-from joe@florence.pavilion.net) Received: (from joe@localhost) by florence.pavilion.net (8.8.8/8.8.8) id SAA21662 for freebsd-hackers@freebsd.org; Thu, 1 Oct 1998 18:58:57 +0100 (BST) (envelope-from joe) Message-ID: <19981001185857.B12010@pavilion.net> Date: Thu, 1 Oct 1998 18:58:57 +0100 From: Josef Karthauser To: freebsd-hackers@FreeBSD.ORG Subject: A CVS merging question. Mail-Followup-To: freebsd-hackers@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.93.2i X-NCC-RegID: uk.pavilion Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG I'm directing this here because someone's more likely to know the answer than on questions. Sorry if this inconviences anyone. A CVS question, hopefully one with an answer. I'm doing a lot of importing at the moment on a vendor branch for Amanda, that we run locally (I know there's a port... :) ) A few versions ago I manually patched some of the files, thus moving their versions onto the HEAD branch (1.x etc.). Some of those patches have made it a more recent version of the code and have been imported onto the vendor branch. Unfortunately because the HEAD isn't on the vendor branch for those files I have to manually adjust for conflicts, etc. What I'd really like to do now is make the vendor branch, for those files, the HEAD so that the merges happen properly. Does anyone have any tips? Joe -- Josef Karthauser Technical Manager FreeBSD: The power to serve (http://www.uk.freebsd.org) Pavilion Internet plc. [joe@pavilion.net, joe@uk.freebsd.org, joe@tao.org.uk] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message