Date: Sun, 20 Apr 2003 16:51:23 -0700 (PDT) From: Doug Barton <DougB@FreeBSD.org> To: Marc Schneiders <marc@schneiders.org> Cc: freebsd-stable@freebsd.org Subject: Re: Mergemaster Request (RE: mergemaster tips) Message-ID: <20030420161118.P631@znfgre.tberna.bet> In-Reply-To: <20030421003459.M36869-100000@voo.doo.net> References: <20030421003459.M36869-100000@voo.doo.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.
--0-122480053-1050882683=:631
Content-Type: TEXT/PLAIN; charset=US-ASCII
On Mon, 21 Apr 2003, Marc Schneiders wrote:
> On Sun, 20 Apr 2003, at 15:22 [=GMT-0700], Doug Barton wrote:
>
> > Ok, can you give me an example of something that you don't understand? I
> > tried to be quite thorough in the man page,
>
> And you are. I just read it for the first time after using mergemaster
> for 3 or 4 years, and I learned a lot.
Well that's good news I suppose. :)
> I thought this was clever, but I now see this isn't good enough. I do
> not want to get an archive, in addition to normal backups, of a
> complete 10 MB /etc directory each time I upgrade.
10 megs!?! Holy code bloat Batman! What the heck do you have in there?
Mine is only 1.3 megs, and that's just because I'm a bit sloppy about
having extra rcNG stuff lying around.
> So here is the feature request: Is it possible to have a new option in
> mergemaster:
>
> -b (path) Make a backup of every file that mergemaster
> overwrites, whether on user input or automatically.
> Mergemaster writes the files in a directory with a
> timestamp name (YYYYMMDD-HHMMSS) under the path
> indicated.
>
> This would give us an archive of the config changes on the machine.
Very interesting idea. Try the attached patch and let me know what you
think. I used -P for "preserve," because I like the semantics better. This
is all subject to change since I just whipped this up, but it should be
enough for you to play with.
Doug
--
This .signature sanitized for your protection
--0-122480053-1050882683=:631
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="mergemaster.sh.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <20030420165123.D631@znfgre.tberna.bet>
Content-Description:
Content-Disposition: attachment; filename="mergemaster.sh.diff"
SW5kZXg6IG1lcmdlbWFzdGVyLnNoDQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvdXNyLnNiaW4vbWVyZ2VtYXN0
ZXIvbWVyZ2VtYXN0ZXIuc2gsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjYu
Mi4xNw0KZGlmZiAtdSAtcjEuNi4yLjE3IG1lcmdlbWFzdGVyLnNoDQotLS0g
bWVyZ2VtYXN0ZXIuc2gJMTAgTWFyIDIwMDMgMDY6NTU6NDggLTAwMDAJMS42
LjIuMTcNCisrKyBtZXJnZW1hc3Rlci5zaAkyMCBBcHIgMjAwMyAyMzo0Nzoz
MiAtMDAwMA0KQEAgLTE1LDcgKzE1LDcgQEANCiBkaXNwbGF5X3VzYWdlICgp
IHsNCiAgIFZFUlNJT05fTlVNQkVSPWBncmVwICJbJF1GcmVlQlNEOiIgJDAg
fCBjdXQgLWQgJyAnIC1mIDRgDQogICBlY2hvICJtZXJnZW1hc3RlciB2ZXJz
aW9uICR7VkVSU0lPTl9OVU1CRVJ9Ig0KLSAgZWNobyAnVXNhZ2U6IG1lcmdl
bWFzdGVyIFstc2NydmFoaXBDXSBbLW0gL3BhdGhdJw0KKyAgZWNobyAnVXNh
Z2U6IG1lcmdlbWFzdGVyIFstc2NydmFoaXBDUF0gWy1tIC9wYXRoXScNCiAg
IGVjaG8gJyAgICAgICAgIFstdCAvcGF0aF0gWy1kXSBbLXUgTl0gWy13IE5d
IFstRCAvcGF0aF0nDQogICBlY2hvICJPcHRpb25zOiINCiAgIGVjaG8gIiAg
LXMgIFN0cmljdCBjb21wYXJpc29uIChkaWZmIGV2ZXJ5IHBhaXIgb2YgZmls
ZXMpIg0KQEAgLTI3LDYgKzI3LDcgQEANCiAgIGVjaG8gJyAgLWkgIEF1dG9t
YXRpY2FsbHkgaW5zdGFsbCBmaWxlcyB0aGF0IGRvIG5vdCBleGlzdCBpbiBk
ZXN0aW5hdGlvbiBkaXJlY3RvcnknDQogICBlY2hvICcgIC1wICBQcmUtYnVp
bGR3b3JsZCBtb2RlLCBvbmx5IGNvbXBhcmVzIGNydWNpYWwgZmlsZXMnDQog
ICBlY2hvICcgIC1DICBDb21wYXJlIGxvY2FsIHJjLmNvbmYgdmFyaWFibGVz
IHRvIHRoZSBkZWZhdWx0cycNCisgIGVjaG8gJyAgLVAgIFByZXNlcnZlIGZp
bGVzIHRoYXQgYXJlIG92ZXJ3cml0dGVuJw0KICAgZWNobyAiICAtbSAvcGF0
aC9kaXJlY3RvcnkgIFNwZWNpZnkgbG9jYXRpb24gb2Ygc291cmNlIHRvIGRv
IHRoZSBtYWtlIGluIg0KICAgZWNobyAiICAtdCAvcGF0aC9kaXJlY3Rvcnkg
IFNwZWNpZnkgdGVtcCByb290IGRpcmVjdG9yeSINCiAgIGVjaG8gIiAgLWQg
IEFkZCBkYXRlIGFuZCB0aW1lIHRvIGRpcmVjdG9yeSBuYW1lIChlLmcuLCAv
dmFyL3RtcC90ZW1wcm9vdC5gZGF0ZSArJW0lZC4lSC4lTWApIg0KQEAgLTIz
Nyw3ICsyMzgsNyBAQA0KIA0KICMgQ2hlY2sgdGhlIGNvbW1hbmQgbGluZSBv
cHRpb25zDQogIw0KLXdoaWxlIGdldG9wdHMgIjphc2NydmhpcENtOnQ6ZHU6
dzpEOiIgQ09NTUFORF9MSU5FX0FSR1VNRU5UIDsgZG8NCit3aGlsZSBnZXRv
cHRzICI6YXNjcnZoaXBDUG06dDpkdTp3OkQ6IiBDT01NQU5EX0xJTkVfQVJH
VU1FTlQgOyBkbw0KICAgY2FzZSAiJHtDT01NQU5EX0xJTkVfQVJHVU1FTlR9
IiBpbg0KICAgcykNCiAgICAgU1RSSUNUPXllcw0KQEAgLTI2OSw2ICsyNzAs
MTAgQEANCiAgIEMpDQogICAgIENPTVBfQ09ORlM9eWVzDQogICAgIDs7DQor
ICBQKQ0KKyAgICBQUkVTRVJWRV9GSUxFUz15ZXMNCisgICAgUFJFU0VSVkVf
RklMRVNfRElSPS92YXIvdG1wL21lcmdlbWFzdGVyLXByZXNlcnZlZC1maWxl
cy1gZGF0ZSArJXklbSVkLSVIJU0lU2ANCisgICAgOzsNCiAgIHApDQogICAg
IFBSRV9XT1JMRD15ZXMNCiAgICAgdW5zZXQgQ09NUF9DT05GUw0KQEAgLTYy
Nyw2ICs2MzIsMTUgQEANCiAjIENyZWF0ZSBkaXJlY3RvcmllcyBhcyBuZWVk
ZWQNCiAjDQogZG9faW5zdGFsbF9hbmRfcm0gKCkgew0KKyAgY2FzZSAiJHtQ
UkVTRVJWRV9GSUxFU30iIGluDQorICBbWXldW0VlXVtTc10pDQorICAgIGlm
IFsgLWYgIiR7M30vJHsyIyMqL30iIF07IHRoZW4NCisgICAgICBta2RpciAt
cCAke1BSRVNFUlZFX0ZJTEVTX0RJUn0NCisgICAgICBjcCAkezN9LyR7MiMj
Ki99ICR7UFJFU0VSVkVfRklMRVNfRElSfQ0KKyAgICBmaQ0KKyAgICA7Ow0K
KyAgZXNhYw0KKw0KICAgaW5zdGFsbCAtbSAiJHsxfSIgIiR7Mn0iICIkezN9
IiAmJg0KICAgcm0gLWYgIiR7Mn0iDQogfQ0K
--0-122480053-1050882683=:631--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030420161118.P631>