mergemaster -U overwriting modified files
peter.schuller at infidyne.com
Sat Apr 25 10:10:45 UTC 2009
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 (!!!) on another machine.
Is this a bug or intended? What is the intended functionality of -U?
/ Peter Schuller
PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller at infidyne.com>'
Key retrieval: Send an E-Mail to getpgpkey at scode.org
E-Mail: peter.schuller at infidyne.com Web: http://www.scode.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-questions/attachments/20090425/eeca943e/attachment.pgp
More information about the freebsd-questions