Not getting expected 3-way merge

2020-06-07 Thread Matthew Seaman
I just had a somewhat amusing time updating my CURRENT pkgbase VM. pkg(8) managed to blow away my /etc/master.passwd and /etc/group, replacing them with default versions. I believe this was triggered by the introduction of the new 'test' user and group upstream. Luckily I noticed pretty quickly

Re: Not getting expected 3-way merge

2020-06-07 Thread Kyle Evans
On Sun, Jun 7, 2020 at 5:14 AM Matthew Seaman wrote: > > I just had a somewhat amusing time updating my CURRENT pkgbase VM. > > pkg(8) managed to blow away my /etc/master.passwd and /etc/group, > replacing them with default versions. I believe this was triggered by > the introduction of the new '

Re: Not getting expected 3-way merge

2020-06-07 Thread Matthew Seaman
On 07/06/2020 15:50, Kyle Evans wrote: > Hmm, I think pkg executed the merge successfully when the test user > was introduced here. Do you still have the transcript from this > upgrade available to make sure that it didn't deinstall -runtime due > to a conflict before reinstalling it? > Looks lik

Re: Not getting expected 3-way merge

2020-06-07 Thread Matthew Seaman
On 08/06/2020 06:31, Matthew Seaman wrote: > On 07/06/2020 15:50, Kyle Evans wrote: >> Hmm, I think pkg executed the merge successfully when the test user >> was introduced here. Do you still have the transcript from this >> upgrade available to make sure that it didn't deinstall -runtime due >> to