From owner-freebsd-current@freebsd.org Tue Jul 24 21:04:25 2018 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83C9D1056245 for ; Tue, 24 Jul 2018 21:04:25 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19500803CF; Tue, 24 Jul 2018 21:04:24 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp.greenhost.nl ([213.108.110.112]) by smarthost1.greenhost.nl with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1fi4Tf-0004eT-J6; Tue, 24 Jul 2018 23:04:15 +0200 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: "Ian Lepore" , "Kevin Oberman" Cc: "bob prohaska" , "Herbert J. Skuhra" , "FreeBSD Current" Subject: Re: ntpd as ntpd user question References: <5b90c49f-4616-9ef7-28a1-6445137245ef@nomadlogic.org> <1532191655.1344.80.camel@freebsd.org> <4b7acbd2-0230-345c-4370-24a72d0b492a@nomadlogic.org> <1532193285.1344.83.camel@freebsd.org> <20180721174722.GA40167@www.zefox.net> <1532196850.1344.87.camel@freebsd.org> <20180721220925.GA40238@www.zefox.net> <20180721234941.2ojf76kxxqfhnys7@mail.bsd4all.net> <20180723045552.GA44941@www.zefox.net> <87r2jtiw59.wl-herbert@gojira.at> <20180724015428.GB47869@www.zefox.net> <1532399159.1344.211.camel@freebsd.org> Date: Tue, 24 Jul 2018 23:04:16 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: "Ronald Klop" Message-ID: In-Reply-To: User-Agent: Opera Mail/12.16 (FreeBSD) X-Authenticated-As-Hash: 398f5522cb258ce43cb679602f8cfe8b62a256d1 X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: -0.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, BAYES_50 autolearn=disabled version=3.4.0 X-Scan-Signature: d9b0ae15ee993d77aea4f0208a5c5b8c X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 21:04:25 -0000 On Tue, 24 Jul 2018 06:28:41 +0200, Kevin Oberman wrote: > On Mon, Jul 23, 2018 at 7:25 PM, Ian Lepore wrote: > >> On Mon, 2018-07-23 at 18:54 -0700, bob prohaska wrote: >> > On Mon, Jul 23, 2018 at 09:34:26PM +0200, Herbert J. Skuhra wrote: >> > > >> > > >> > > Yes, first you press m. Then you will see differences of installed >> > > file (left) and new file (right). Then you press either l or >> > > r: >> > > >> > > l | 1: choose left diff >> > > r | 2: choose right diff >> > > >> > > If the diff tries to remove/add to many lines you can: >> > > >> > > el: edit left diff >> > > er: edit right diff >> > > >> > > And if done you can view the merged file (v) before installing (i) >> > > it. >> > > >> > > I am sure, someone can explain it better! :) >> > > >> > Perhaps, but you've made the essential point. Your reply let me >> > understand that >> > mergemaster does not really "master" the merge, it rather identifies >> > files needing >> > to be merged and then starts sdiff to let me modify files. Never >> > having even looked >> > at sdiff, the learning curve proved very steep. Too steep, in fact. >> > >> > I'm going to try a more incremental approach. >> > >> > Thank you _very_ much! >> > >> > bob prohaska >> >> Your reaction to mergemaster is about the same as mine was when I first >> encountered it very long ago, and re-discovered when I tried it a >> couple years ago. It just seems like more trouble than it's worth, I >> can usually figure out what's broken and fix it by hand faster than >> messing with all the merge stuff. >> >> But, someone told me that if you give mergemaster the right flags it >> can potentially be intervention-free. Those apparently aren't the flag >> or two that're suggested at the bottom of UPDATING. So I didn't really >> dig into that any deeper, but I toss it out there in case someone can >> expand on it. >> >> It certainly makes some sense that it could be done intervention-free. >> When doing other diff-based merges (like 'svn update') you only have to >> intervene when there's an actual conflict between some local change >> you've made and the incoming changes. >> >> > It gets a LOT simpler if you use "mergemaster -iPUF" Only those files you > have modified will show up. In most cases, it just zips right by. In most > that it does not, the use of 'r' or 'l' in merge is all you need and > always > 'r' eccepton lines you have modified, yourself, so you should know about > them. > > I should note that 'U' does have a small "race" in it, so it i possible > to > get biten by it, but it is very unlikely. Has to do with multiple commits > that touch the same lines in the file in a timing that is out of sync > with > your running it. I use '-iPF' because I m paranoid. $ cat /etc/mergemaster.rc AUTO_INSTALL=yes AUTO_UPGRADE=yes COMP_CONFS=yes FREEBSD_ID=yes IGNORE_FILES='/etc/motd /etc/printcap' This helps me a lot. Cheers, Ronald. > -- > Kevin Oberman, Part time kid herder and retired Network Engineer > E-mail: rkoberman@gmail.com > PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to > "freebsd-current-unsubscribe@freebsd.org"