From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C58A1381F3 for ; Sat, 30 Dec 2017 18:19:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4F7AE08F0; Sat, 30 Dec 2017 18:19:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 511C0E08D9 for ; Sat, 30 Dec 2017 18:19:09 +0000 (UTC) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id F101E335C31 for ; Sat, 30 Dec 2017 18:19:07 +0000 (UTC) Received: by mail-wr0-f171.google.com with SMTP id w68so31480694wrc.10 for ; Sat, 30 Dec 2017 10:19:07 -0800 (PST) X-Gm-Message-State: AKGB3mK+pd5xE9JWw32UDEaKeXydVKQgd1OuCSSt+yhPmZoOdPCFJCRc pQPlQ0cqJEzpup0sjTL5nbB+BJn/WkVPyADFWtc= X-Google-Smtp-Source: ACJfBoulAY6/OSoGsnHVjW2uIAl/K4eotKiFypebp9aUC3oAPgdFe7rKEALzswQq1oK2OtRSaibZIcJj2+5OnJOwCaA= X-Received: by 10.223.166.130 with SMTP id t2mr18710102wrc.244.1514657945194; Sat, 30 Dec 2017 10:19:05 -0800 (PST) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 Received: by 10.223.154.5 with HTTP; Sat, 30 Dec 2017 10:18:44 -0800 (PST) In-Reply-To: <20171230181032.wnffo5tm52eho5nk@matica.foolinux.mooo.com> References: <20171230181032.wnffo5tm52eho5nk@matica.foolinux.mooo.com> From: Mike Gilbert Date: Sat, 30 Dec 2017 13:18:44 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [gentoo-user] dispatch-conf, the big pic? To: gentoo-user@lists.gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: 2353d023-f43c-4b5c-8271-f3fb18c3109e X-Archives-Hash: f090258d1127cc8de412ec478fa4d01c On Sat, Dec 30, 2017 at 1:10 PM, Ian Zimmerman wrote: > I realized I don't really understand it - I just repeat by rote some > keystrokes. In particular: > > What do the 'z' and 'n' commands do exactly, and what's the difference > between them? The 'z' command throws away the new config file, leaving the existing config file in place. Use this when you don't care about the changes in the new file at all. The 'n' command skips over the current file, and does nothing. If you quit and re-run dispatch-conf, you should be prompted to do something with the file again. > After I do a 'm', how do I actually use the result of the merge? Is the > merged file now the same as the 'new' one, or the same as the 'old' one? > IOW, if I do 'm' and then 'z', will the merged version be the active > one? After completing the merge, use the 'u' command to use the merged version. Use the 'z' command to throw away the merged version and stick with the old file.