doug at fledge.watson.org
Tue Jul 12 17:40:45 UTC 2011
On Thu, 7 Jul 2011, doug at safeport.com wrote:
> I have a mergemaster question. I assume this is my error but do not see what
> I did. I am testing remote update procedures so I started with a 7.0 IS0 and
> updated it to 7.4.
> My mergemaster.rc has the following directives:
> plus some diff options. As this was a system with nothing changed except for
> group, passwd, and csh.cshrc, I expected mergemaster to update all the other
> files. I think from the code the value does not matter for the first three so
> yes would be ok (if I am correct).
> As this did not work (as I expected), I retried with mergemaster -rFUi
> getting the same result. What did I do wrong?
I was afraid that was the answer. Dusting off my script seems to be it.
More information about the freebsd-questions