From owner-freebsd-hackers@FreeBSD.ORG  Tue Oct 22 20:28:13 2013
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3BEAB31A;
 Tue, 22 Oct 2013 20:28:13 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 14E2E25D1;
 Tue, 22 Oct 2013 20:28:13 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 13DAAB98D;
 Tue, 22 Oct 2013 16:28:12 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: freebsd-hackers@freebsd.org
Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong?
Date: Tue, 22 Oct 2013 15:50:10 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; )
References: <CAF-QHFUjfsepwuGnBAhL6x=HYznPj3Cj+6fX_O36s8U6C7b7Nw@mail.gmail.com>
 <CAPJF9w=Xc9-6v-KkyVdwUZybGX0Ou-qCvGVtQVxbu81jtZYD1w@mail.gmail.com>
In-Reply-To: <CAPJF9w=Xc9-6v-KkyVdwUZybGX0Ou-qCvGVtQVxbu81jtZYD1w@mail.gmail.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201310221550.10291.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Tue, 22 Oct 2013 16:28:12 -0400 (EDT)
Cc: Alexander Yerenkow <yerenkow@gmail.com>, Ivan Voras <ivoras@freebsd.org>
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
 <freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-hackers>, 
 <mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
 <mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 20:28:13 -0000

On Tuesday, October 01, 2013 5:38:15 am Alexander Yerenkow wrote:
> To make better tool (than current behaviour of mergemaster regarding
> configs/source files) which could make merge an easy task it *must* have
> such things:
> 
> a) way to get Original configs/files from revision from you are upgrading
> ($Rev1)
> b) way to get Original configs/files from revision to you are upgrading
> ($Rev100)
> c) have ability to ignore differencies in comments
> d) have ability to treat special cases (as $FreeBSD$ - just took newer line)
> 
> Then, your each new file will be  $Rev100 + diff_changes(CURRENT, $Rev1) +
> diff_changes($Rev100, $Rev1).
> Note, that in case that your diffs are none  diff_changes(CURRENT, $Rev1) =
> 0, then you can simply get new file.
> Same thing in case that only $FreeBSD$ changed.
> 
> I have some PoC-es for this, but not in shell, maybe I'll come up someday
> with full tool.

Try etcupdate.

-- 
John Baldwin