On Wed, Jan 7, 2009 at 10:55 PM, Peter Boosten wrote:
> matt donovan wrote:
> > On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote:
> >>>
> >> Well, my point is that mergemaster shouldn't have to delete ALL
> accounts,
> >> just to add one. User and group accounts can be added to the
> passwd/g
matt donovan wrote:
> On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote:
>>>
>> Well, my point is that mergemaster shouldn't have to delete ALL accounts,
>> just to add one. User and group accounts can be added to the passwd/group
>> file *without* deleting the others.
>>
>
> mergemaster doesn'
On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote:
> Albert Shih wrote:
>
>> Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit
>>
>>> Johann Hasselbach wrote:
>>>
I was doing a src upgrade from 7.0 to 7.1
After installkernel, i rebooted, and accidently ran "mergemaster"
Albert Shih wrote:
Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit
Johann Hasselbach wrote:
I was doing a src upgrade from 7.0 to 7.1
After installkernel, i rebooted, and accidently ran "mergemaster"
instead of "mergemaster -p" before installworld. I ctrl-c'd once I
realized what I had d
Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit
> Johann Hasselbach wrote:
> > I was doing a src upgrade from 7.0 to 7.1
> >
> > After installkernel, i rebooted, and accidently ran "mergemaster"
> > instead of "mergemaster -p" before installworld. I ctrl-c'd once I
> > realized what I had do
Yuri Pankov wrote:
> On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote:
>>
>> Also: most scripts updated by mergemaster during 7.0->7.1 are only
>> version numbering diffs. Is there no smarter way to do this, apart from
>> typing 'i' every time?
>
> I think you want -U option (auto upg
Yuri Pankov writes:
> > Also: most scripts updated by mergemaster during 7.0->7.1 are only
> > version numbering diffs. Is there no smarter way to do this, apart from
> > typing 'i' every time?
>
> I think you want -U option (auto upgrade files that have not been
> modified by user) along
On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote:
> Johann Hasselbach wrote:
> > I was doing a src upgrade from 7.0 to 7.1
> >
> > After installkernel, i rebooted, and accidently ran "mergemaster"
> > instead of "mergemaster -p" before installworld. I ctrl-c'd once I
> > realized what
Johann Hasselbach wrote:
> I was doing a src upgrade from 7.0 to 7.1
>
> After installkernel, i rebooted, and accidently ran "mergemaster"
> instead of "mergemaster -p" before installworld. I ctrl-c'd once I
> realized what I had done, but the damage was done.
>
> It seems to have overwritten my
