From owner-freebsd-current@freebsd.org Sat Aug 11 08:02:23 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 10E7E1062065 for ; Sat, 11 Aug 2018 08:02:23 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7D70D70A8D for ; Sat, 11 Aug 2018 08:02:22 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wr1-x42d.google.com with SMTP id c13-v6so10132414wrt.1 for ; Sat, 11 Aug 2018 01:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=THy44L7IeA4FJR2Ok5V7hv0zV2nkADZsTdGNJrL8N20=; b=WvQ9Fy86rpUsVlkUnQIwCQJsDJBfoh5TyTljBXY6bCRivPF3+hfY031XrdnATGloeR jqUQoxBu1oLHZr7l4qzG/eGTRZv8ta2HVF/OuvQaySnuUwwruWh7A4PUIrIsJj1B+Ah2 AwYWqCOPgaYDqZEtTHBUd4KO4JbunkEWugMpEZ/iA7D1t4+/EApU5nHQSM7bPhfWxSrI Sap8Tqn74pTC5zdF8sWIyHzOp0uAhXC4mdwY1wxiiBqSmI6uwR5HHw7fg7MHhv0jvy1K MTW6iT2XUSylQq0GNqQgFKpQ2juIjXEh9US8JM/xdPyo2399HvMUIpBilYrMrWAUcVVP 2+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=THy44L7IeA4FJR2Ok5V7hv0zV2nkADZsTdGNJrL8N20=; b=ApdQBnuC2PPZ6xuNWt5FvgJ5OsrZqo9hWoVciwX7XsEjWchP6SuxygKl4r0x9CHzDz Fcr6mF7OM2ryOawhxSAzO5XBFJnLtweeHa62gdyCqmEmF9CeO5kveeHpAqHn0/Ss6cB3 Ges3TIXyiOkn36ucceIEZeJfNUG2o95vBA2hcekrsig/sdzpSsTwlpKYA89D6CnB958i RjHfUXyrY8k7fTKZnPnNs3TisjCzAiYxuPzui67yKOnRJmA8XyXGBrrf116rx1X5xYkt riF3Ym5Mos+ivWEdRWeIui9b5WwccTkI5y6ILw0v33RUABrB+5ylJ/1e6nvgW9Ks43Q3 yNjQ== X-Gm-Message-State: AOUpUlGAzB2Kwse5r++4lz9A2irRe6ff5CbcbvoVxV03utSceew0aJnq TvDhvXHCt7HzbbKOV6Iw5rbZqH2k X-Google-Smtp-Source: AA+uWPycEH0J6YLzhPfclKoUOaapmM0hcXoNroZSSatmz56tExH5YuNvOiJGxzes/pvNZT6Y3ilHGw== X-Received: by 2002:a5d:648a:: with SMTP id r10-v6mr6096322wru.109.1533974540933; Sat, 11 Aug 2018 01:02:20 -0700 (PDT) Received: from [192.168.1.231] (host-78-150-66-180.as13285.net. [78.150.66.180]) by smtp.gmail.com with ESMTPSA id x82-v6sm10425088wmd.11.2018.08.11.01.02.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Aug 2018 01:02:20 -0700 (PDT) To: freebsd-current@freebsd.org From: Graham Perrin Subject: Unexpected results with 'mergemaster -Ui' Message-ID: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com> Date: Sat, 11 Aug 2018 09:02:18 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-GB 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: Sat, 11 Aug 2018 08:02:23 -0000 line 133 onwards, for example. I never before found any potential change to /etc/group Please, is it unusual? Lack of experience here. I have updated the system only a few times (maybe less than a dozen), the result of mergemaster on this occasion took me by surprise. Results on all previous occasions were relatively terse, much less to consider/merge. ---- Also today, with an earlier run of mergemaster, when I _did_ choose to install a temporary file, the installation failed. I didn't keep a note of the specifics but a file mode was mentioned.