From owner-freebsd-questions Sat Mar 24 9:34: 5 2001 Delivered-To: freebsd-questions@freebsd.org Received: from guru.mired.org (okc-65-26-235-186.mmcable.com [65.26.235.186]) by hub.freebsd.org (Postfix) with SMTP id 4195237B719 for ; Sat, 24 Mar 2001 09:34:03 -0800 (PST) (envelope-from mwm@mired.org) Received: (qmail 60835 invoked by uid 100); 24 Mar 2001 17:34:01 -0000 From: Mike Meyer MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15036.55945.813447.864291@guru.mired.org> Date: Sat, 24 Mar 2001 11:34:01 -0600 To: "Kevin Oberman" , jason@jason-n3xt.org Cc: questions@freebsd.org Subject: Re: Mergemaster In-Reply-To: <9999968@toto.iv> X-Mailer: VM 6.89 under 21.1 (patch 14) "Cuyahoga Valley" XEmacs Lucid X-face: "5Mnwy%?j>IIV\)A=):rjWL~NB2aH[}Yq8Z=u~vJ`"(,&SiLvbbz2W`;h9L,Yg`+vb1>RG% *h+%X^n0EZd>TM8_IB;a8F?(Fb"lw'IgCoyM.[Lg#r\ Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Kevin Oberman types: > I think I might have to try writing a tutorial on mergemaster. For > some reason lots of folks are either confused about how to run it or > are intimidated by it. I think you just did. > When you get to a file that you have edited, you probably want to do > merge. If you select 'm', you will get an sdiff display where you can > blend lines from your existing file (on the left) and the new file > (on the right) by entering 'l' or 'r'. One thing that Kevin overlooked that will make your life easier - always chose the new (r) vesion of the CVS file Id line. That's almost always the first difference in the file, and has the version number and such in it. mergemaster uses that line to decide if a file has changed or not. By choosing the new version, you're telling mergemaster you've dealt with this file, and it won't bother you about it again until it gets changed in the source tree. http://www.mired.org/home/mwm/ Independent WWW/Perforce/FreeBSD/Unix consultant, email for more information. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message