From owner-freebsd-current@freebsd.org Tue Jul 24 04:28:43 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 924BC103F13B for ; Tue, 24 Jul 2018 04:28:43 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-oi0-x233.google.com (mail-oi0-x233.google.com [IPv6:2607:f8b0:4003:c06::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1702C7E034; Tue, 24 Jul 2018 04:28:43 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: by mail-oi0-x233.google.com with SMTP id y207-v6so5157493oie.13; Mon, 23 Jul 2018 21:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=dMoVp7t5w/vnMY9aJnXo7UR/uh/EosdouRim44jQ7Tg=; b=GeBRZigEW/RfjqisO5sAfn9raoEMXRmpbW74fsuJq6mDRNgLV5X7YM3GOFn8EaxcZV nPLlXk0umPbT4nTmOrkojJGCyCBpyPJsVIGgI3XUpInrgL++jfllibM819lkMW9Ulya4 m5/GhIZCNLOI0+OHJS2TSwNAb7bWipXtKizwj7RcbxYoVyZC9b2efxKkwE1ZWuyeDrT0 7d81FdVir8bCuIiPwR4jWKca/BNOltH4mEWhhaEUEJRrVQ0QaMUi2AxGnFFU15Y8nuZQ PmDKlai+UlTx9WBNtFEI8hVvZPuZ1hLaS/3tyMEExtXSyj09W8AdASkHZIvXek+8k1Jr kYWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=dMoVp7t5w/vnMY9aJnXo7UR/uh/EosdouRim44jQ7Tg=; b=ieCZQ02Ez1oFX6wD5vL9K3zMb1EluYD9MrRAzPk0eKFhlwBOLBo8+DI+dsWqkEDIhL DzPOW3pF7GLDvYhAUCEtgpuJ1XzwO3Cxug6plN258lUQrgVvDXaTgzUl41O4HZZCewD6 sWOEiiTY+IHkUenvVQiFIMgyEknVYAlZGzf7pogIlukxg179IWIG953XjMQyAzOTQfIh IkvhIoyMS09gPem1YhX7oxrAiA5i8LdKcKX5UO6nDYTKJJa11igKheGj18TnDxvQn2OP l6FLMYQMopSP9S+GsVY3K1PkcbzzHJFm4iWNRXJjYltpk8VJ6KeNx4l+Zz42QYkP+/s4 l0cA== X-Gm-Message-State: AOUpUlHcAyvnatwmhU9EalsdHvGb9ldtDv8+bsBYaen3TinVpBh4S5j3 aCsqMXYm3VhshCL950wrpxAqR99TGkBaSR1IdLSm3dYz X-Google-Smtp-Source: AAOMgpc78VQDzLsYtJoRFKQAmolfHOOTZgWdy7yMsKVbvS4esNU/aV5ThZEAOnqC4wvp9JIqIFa1bllizrs/Bb+37qc= X-Received: by 2002:aca:578b:: with SMTP id l133-v6mr1655570oib.329.1532406521766; Mon, 23 Jul 2018 21:28:41 -0700 (PDT) MIME-Version: 1.0 Sender: kob6558@gmail.com Received: by 2002:ac9:2c55:0:0:0:0:0 with HTTP; Mon, 23 Jul 2018 21:28:41 -0700 (PDT) In-Reply-To: <1532399159.1344.211.camel@freebsd.org> 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> From: Kevin Oberman Date: Mon, 23 Jul 2018 21:28:41 -0700 X-Google-Sender-Auth: dc8wBU1ssw7mDBIO2XiKuKVhJJI Message-ID: Subject: Re: ntpd as ntpd user question To: Ian Lepore Cc: bob prohaska , "Herbert J. Skuhra" , FreeBSD Current Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 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 04:28:43 -0000 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. -- Kevin Oberman, Part time kid herder and retired Network Engineer E-mail: rkoberman@gmail.com PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683