DragonFly BSD
DragonFly bugs List (threaded) for 2003-07
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

patch for mergemaster was Re: ps warning


From: Steve Mynott <steve@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri, 25 Jul 2003 21:20:55 +0100

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@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





[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]