Re: mergemaster still having issues

2019-05-17 Thread David Wolfskill
On Fri, May 17, 2019 at 10:55:18AM -0700, Pete Wright wrote: > ... > > E.g.: > > pushd usr.bin/mergemaster && make install; popd > > > > Then re-start the userland installation (e.g., "mergemaster -p ...") and > > proceed with the rest of the install as usual. > > Ah OK, i think missed that

Re: mergemaster still having issues

2019-05-17 Thread Pete Wright
On 5/17/19 10:51 AM, David Wolfskill wrote: On Fri, May 17, 2019 at 10:46:57AM -0700, Pete Wright wrote: hello - i am still having issues with mergemaster when building/installing current on my end as per this thread: https://lists.freebsd.org/pipermail/freebsd-current/2019-May/073403.html

Re: mergemaster still having issues

2019-05-17 Thread David Wolfskill
On Fri, May 17, 2019 at 10:46:57AM -0700, Pete Wright wrote: > hello - i am still having issues with mergemaster when > building/installing current on my end as per this thread: > https://lists.freebsd.org/pipermail/freebsd-current/2019-May/073403.html > > my source contains the fix that I think