Re: mergemaster -U overwriting modified files

2009-05-16 Thread Doug Barton
-BEGIN PGP SIGNED MESSAGE- Hash: RIPEMD160 Mel Flynn wrote: On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote: Bruce Cran wrote: On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller peter.schul...@infidyne.com wrote: I recently began testing mergemaster -U since the perpetual

Re: mergemaster -U overwriting modified files

2009-05-15 Thread Mel Flynn
On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote: Bruce Cran wrote: On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller peter.schul...@infidyne.com wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick.

Re: mergemaster -U overwriting modified files

2009-04-27 Thread Victor Sudakov
Peter Schuller wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my

Re: mergemaster -U overwriting modified files

2009-04-26 Thread Frederique Rijsdijk
Bruce Cran wrote: On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller peter.schul...@infidyne.com wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do

Re: mergemaster -U overwriting modified files

2009-04-26 Thread Jeffrey Goldberg
On Apr 25, 2009, at 5:10 AM, Peter Schuller wrote: Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my /etc/namedb/named.conf (!!!) on another machine. Me, too. I lost exactly those two files during

mergemaster -U overwriting modified files

2009-04-25 Thread Peter Schuller
I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my /etc/namedb/named.conf (!!!)

Re: mergemaster -U overwriting modified files

2009-04-25 Thread Bruce Cran
On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller peter.schul...@infidyne.com wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do what you might