Date: Sun, 20 Jan 2008 19:27:06 +0100 From: "Zbigniew Szalbot" <zszalbot@gmail.com> To: RW <fbsd06@mlists.homeunix.com> Cc: freebsd-questions@freebsd.org Subject: Re: 6.2-Release to 6.3-Release and automatically merge changes Message-ID: <94136a2c0801201027o3a00a333w5c98d8192f2abea3@mail.gmail.com> In-Reply-To: <20080120180120.6cc96f9a@gumby.homeunix.com.> References: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> <20080120000048.0cee1189@gumby.homeunix.com.> <94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com> <20080120180120.6cc96f9a@gumby.homeunix.com.>
next in thread | previous in thread | raw e-mail | index | archive | help
Hello, 2008/1/20, RW <fbsd06@mlists.homeunix.com>: > On Sun, 20 Jan 2008 16:13:26 +0100 > "Zbigniew Szalbot" <zszalbot@gmail.com> wrote: > > > > Which lines should I delete and which leave intact? > > This one here is short but there are some other where the changes > > apply to quite a few lines. I have trouble finding out how to "accept > > the new versions"? > > I've not used freebsd-update.sh, I assumed it was just calling > mergemaster. Does it really not give you option of accepting a whole > file? No, it says (for example) The following file could not be merged automatically: /etc/defaults/periodic.conf Press Enter to edit this file in vi and resolve the conflicts manually... So I have the vi open but I wonder which lines to remove and which to leave? Thanks! Zbigniew Szalbot
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?94136a2c0801201027o3a00a333w5c98d8192f2abea3>