From owner-freebsd-stable Thu Apr 4 23:28:36 2002 Delivered-To: freebsd-stable@freebsd.org Received: from ns.museum.rain.com (gw-ipinc.museum.rain.com [206.29.169.27]) by hub.freebsd.org (Postfix) with ESMTP id 1AC3C37B419 for ; Thu, 4 Apr 2002 23:28:32 -0800 (PST) Received: (from stable@localhost) by ns.museum.rain.com (8.11.6/8.11.6) id g357SVu95078 for freebsd-stable@freebsd.org; Thu, 4 Apr 2002 23:28:31 -0800 (PST) (envelope-from stable) Date: Thu, 4 Apr 2002 23:28:31 -0800 From: James Long To: freebsd-stable@freebsd.org Subject: mergemaster: what if I want both left and right? Message-ID: <20020404232831.A95052@ns.museum.rain.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In doing some merges lately, I've gotten into situations where mergemaster gives me a choice between old lines I want to keep on the left, and new lines which I want to add on the right. A specific example was in merging my /etc/group and /etc/passwd files, I had the choice between some existing groups which I need to retain on the left, and some newly-added system groups which I want to incorporate, on the right. How can I tell mergemaster something like, "insert the left alternative first, followed by the right alternative" or vice versa, right first, then left? Must I just edit the file(s) manually? And I suppose if we're going to add some flavor of a 'both' option, it's only a matter of time before a need for 'neither' arises. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message