Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Jan 2014 17:13:17 +0000
From:      RW <rwmaillists@googlemail.com>
To:        freebsd-questions@freebsd.org
Subject:   Re: freebsd-update automerge ignoring mergemaster.rc?
Message-ID:  <20140124171317.35574e28@gumby.homeunix.com>
In-Reply-To: <CAHzLAVFME_=W_21zQb3otbhByg8Rb1YT0tYSvTE5ngk+e_EtYg@mail.gmail.com>
References:  <CAHzLAVFME_=W_21zQb3otbhByg8Rb1YT0tYSvTE5ngk+e_EtYg@mail.gmail.com>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
On Fri, 24 Jan 2014 11:33:01 -0500
Rick Miller wrote:


> The results are many merges that could not occur mainly due to the CVS
> version lines despite having /etc/mergemaster.rc setup.  Here is the
> contents of the config file:

freebsd-update doesn't use mergemaster.



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?20140124171317.35574e28>