From owner-freebsd-stable@FreeBSD.ORG Mon Apr 21 02:40:06 2003 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE67B37B401 for ; Mon, 21 Apr 2003 02:40:06 -0700 (PDT) Received: from frmug.org (frmug-gw.frmug.org [193.56.58.252]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7B0943FE1 for ; Mon, 21 Apr 2003 02:40:04 -0700 (PDT) (envelope-from olive@oban.frmug.org) Received: (from uucp@localhost)h3L9dZP22811 for freebsd-stable@freebsd.org; Mon, 21 Apr 2003 11:39:35 +0200 (CEST) (envelope-from olive@oban.frmug.org) Received: by weirdos.oban.frmug.org (Postfix, from userid 1002) id 6739D8C13; Mon, 21 Apr 2003 11:35:42 +0200 (CEST) Date: Mon, 21 Apr 2003 11:35:42 +0200 From: Olivier Tharan To: freebsd-stable@freebsd.org Message-ID: <20030421093542.GB1287@weirdos.oban.frmug.org> Mail-Followup-To: freebsd-stable@freebsd.org References: <20030420161118.P631@znfgre.tberna.bet> <006701c307a5$ee7948b0$0200a8c0@travel> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <006701c307a5$ee7948b0$0200a8c0@travel> X-Attribution: Olive Subject: Re: Mergemaster Request (RE: mergemaster tips) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2003 09:40:07 -0000 * Anton Zavrin (20030420 18:32): > What are those: CVS $Id's? Last time I was using mergemaster I got many > files with the same CVS $Id's and they were deleted or something. The CVS $Id$ have to do with version control, managed with the FreeBSD developers. The goal of mergemaster is to take into account new elements of configuration files while trying to keep your local modifications. If/when mergemaster detects the CVS $Id$ has not changed, it means the file in the FreeBSD tree has not changed, so it will not bother trying to update the file, even if it is not the same as in the sources. > Need a better explanation of such little things like: "!", "---", "+++", > etc. You need to be a little more familiar with patch(1) and diff(1), they can help you even if you don't do development. > I think I was wrong about saying that man pages are not good, what I > meant is that would be great to have a help page/FAQ with real life > examples of how to use mergemaster, entire process. What I usually use was taken from Usenet: - "mergemaster -svia" to do the automatic part (the files that will be upgraded without your consideration) - "mergemaster -vr" to do the actual merging on the remaining files. You should review the man page to understand each option. What I usually add between both commands is "PAGER=less" because I prefer less to more to view the diffs. -- olive