patch for mergemaster was Re: ps warning
Steve Mynott
steve at tightrope.demon.co.uk
Fri Jul 25 13:20:55 PDT 2003
Steve Mynott wrote:
I had to copy sysdb, network.subr and rc.subr manually
They don't seem touched by mergemaster, even after I install a stat
command.
I had a lot more success with "mergemaster -s" then noticed its still
comparing FreeBSD tags with CVS_ID_TAG=FreeBSD set on line 409
The Fix:
root at fred sbin> diff -u mergemaster mergemaster.20030725
--- mergemaster Fri Jul 25 18:53:44 2003
+++ mergemaster.20030725 Fri Jul 25 14:01:26 2003
@@ -406,7 +406,7 @@
# Define what CVS $Id tag to look for to aid portability.
#
-CVS_ID_TAG=DragonFly
+CVS_ID_TAG=FreeBSD
delete_temproot () {
rm -rf "${TEMPROOT}" 2>/dev/null
-- Steve
More information about the Bugs
mailing list