Date: Tue, 22 Oct 2013 15:50:10 -0400 From: John Baldwin <jhb@freebsd.org> To: freebsd-hackers@freebsd.org Cc: Alexander Yerenkow <yerenkow@gmail.com>, Ivan Voras <ivoras@freebsd.org> Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong? Message-ID: <201310221550.10291.jhb@freebsd.org> In-Reply-To: <CAPJF9w=Xc9-6v-KkyVdwUZybGX0Ou-qCvGVtQVxbu81jtZYD1w@mail.gmail.com> References: <CAF-QHFUjfsepwuGnBAhL6x=HYznPj3Cj%2B6fX_O36s8U6C7b7Nw@mail.gmail.com> <CAPJF9w=Xc9-6v-KkyVdwUZybGX0Ou-qCvGVtQVxbu81jtZYD1w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310221550.10291.jhb>