Re: sysutils/etcmerge vs mergemaster
Isn't that what the -U option in mergemaster does? -U Attempt to auto upgrade files that have not been user modified. I believe I tried this once and it did not make a difference, but I didn't investigate. Perhaps I screwed up. But even so, three-way merging is nice, so etcmerge remains interesting. Thanks, -- / Peter Schuller PGP userID: 0xE9758B7D or 'Peter Schuller [EMAIL PROTECTED]' Key retrieval: Send an E-Mail to [EMAIL PROTECTED] E-Mail: [EMAIL PROTECTED] Web: http://www.scode.org signature.asc Description: This is a digitally signed message part.
Re: sysutils/etcmerge vs mergemaster
On Sun, 18 Nov 2007 13:01:56 +0100 Peter Schuller [EMAIL PROTECTED] wrote: Isn't that what the -U option in mergemaster does? -U Attempt to auto upgrade files that have not been user modified. I believe I tried this once and it did not make a difference, but I didn't investigate. Perhaps I screwed up. It's something I only noticed on the 6.2 upgrade, and I've never actually used. It seems to work by comparing hashes of installed files with the cvs versions from the previous run. I guess it doesn't work on the first upgrade as there's no stored database. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
sysutils/etcmerge vs mergemaster
Hello, etcmerge, with three-way merging, has been available for a while, but the man page still warns of it not being extensively tested, and of course mergermaster still seems to be the officially supported tool. In spite of this, etcmerge is attractive since, to be honest, manually saying yes update to a bunch of files that mostly have only CVS revision changes is a waste of time. (In addition even files with local changes would be easier to handle with etcmerge) Given the obvious benefit to etcmerge's fundamental algorithm I have to wonder why it does not seem to be more wide spread in use. Are there problems with it that I don't know about? How many people use it in production? Are there advantages to mergemaster that causes mergemaster to even be preferred over etcmerge as the default tool in base? -- / Peter Schuller PGP userID: 0xE9758B7D or 'Peter Schuller [EMAIL PROTECTED]' Key retrieval: Send an E-Mail to [EMAIL PROTECTED] E-Mail: [EMAIL PROTECTED] Web: http://www.scode.org signature.asc Description: This is a digitally signed message part.
Re: sysutils/etcmerge vs mergemaster
On Sat, 17 Nov 2007 11:15:58 +0100 Peter Schuller [EMAIL PROTECTED] wrote: Hello, etcmerge, with three-way merging, has been available for a while, but the man page still warns of it not being extensively tested, and of course mergermaster still seems to be the officially supported tool. In spite of this, etcmerge is attractive since, to be honest, manually saying yes update to a bunch of files that mostly have only CVS revision changes is a waste of time. Isn't that what the -U option in mergemaster does? -U Attempt to auto upgrade files that have not been user modified. BTW does etcmerge handle the merging of passwd and groups well, because that's what I hate more than anything else about upgrading. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
