Date: Sat, 24 Mar 2001 11:34:01 -0600 From: Mike Meyer <mwm@mired.org> To: "Kevin Oberman" <oberman@es.net>, jason@jason-n3xt.org Cc: questions@freebsd.org Subject: Re: Mergemaster Message-ID: <15036.55945.813447.864291@guru.mired.org> In-Reply-To: <9999968@toto.iv>
next in thread | previous in thread | raw e-mail | index | archive | help
Kevin Oberman <oberman@es.net> 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. <mike -- Mike Meyer <mwm@mired.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15036.55945.813447.864291>