Date: Wed, 13 Dec 2000 10:14:57 -0800 From: Doug Barton <DougB@FreeBSD.org> To: Christopher Farley <chris@northernbrewer.com> Cc: freebsd-questions@FreeBSD.org Subject: Re: mergemaster Message-ID: <3A37BCA1.48ED93B6@FreeBSD.org> References: <C12569B2.0054F8EE.00@frmail19.netfr.alcatel.fr> <20001211094625.A61816@northernbrewer.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Christopher Farley wrote:
>
> Gilles.Guerrini@alcatel.fr (Gilles.Guerrini@alcatel.fr) wrote:
>
> > Hello,
> > i want to update my FreeBSD from 4.1 release to 4.2 RELEASE. What a good idea !!
> > When I do a 'mergemaster', by default, if there is no personnal change, must I 'delete' the new file
> > or must I 'install' it ??
> > Thanks for your help
> > Gilles G.
>
> If the files aren't different, it shouldn't matter which you do.
If the files aren't different, you won't get prompted to delete or
install, the temproot version will just be deleted. He's asking whether
he should install files that have changed in the base, but that he's not
modified in his installed version.
Doug
--
So what I want to know is, where does the RED brick road go?
Do YOU Yahoo!?
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3A37BCA1.48ED93B6>