Date: Wed, 20 Jun 2001 00:27:38 -0700 From: Doug Barton <DougB@DougBarton.net> To: freebsd-stable@freebsd.org Subject: *** Mini Head's up: mergemaster spurious warning fix Message-ID: <3B30506A.28952430@DougBarton.net>
index | next in thread | raw e-mail
Gang, Thanks for your patience while I dug into the problem related to the spurious warning generated by mergemaster when installing a file, and my apologies for any inconvenience it may have caused you. The error was a result of my testing only what mm was actually doing on RELENG_4, not what it _said_ about what it was doing. :) In any case, a fix has been committed to -current, and following standard practice will be MFC'ed after it's had a chance to be tested. The change that caused the spurious warning is a result of "copy" being the new default in -current for install instead of "move." Since this is not the case in RELENG_4 (and hopefully never will be) a more robust solution than the simple one I used originally had to be created. You can find the patch at: http://people.freebsd.org/~dougb/mm-fix-rm-bug.diff If you try that patch and have any problems with it, please let me know. That patch was generated from the RELENG_4 branch so it should apply cleanly to version 1.6.2.7. Barring any reports of problems that's what I'll MFC. HTH, Doug -- If you're never wrong, you're not trying hard enough. Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the messagehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3B30506A.28952430>