Re: CURRENT, usr/src on git, howto "mergemaster"?

On Wed, Jan 06, 2021 at 11:24:22AM +, tech-lists wrote: > >Moreover mergemaster is still officially documented and recommend as > >only right method in FreeBSD handbook. See > >https://www.freebsd.org/doc/handbook/makeworld.html. > >World is moving, we may have new tools but each deprecation

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 08:47:28PM +0100, Michal Meloun wrote: Moreover mergemaster is still officially documented and recommend as only right method in FreeBSD handbook. See https://www.freebsd.org/doc/handbook/makeworld.html. World is moving, we may have new tools but each deprecation should

Re: CURRENT, usr/src on git, howto "mergemaster"?

David Wolfskill david at catwhisker.org wrote on Mon Jan 4 12:29:45 UTC 2021 : > After trying to use mergemaster for a couple of weeks (after the switch > to sources from git, vs. svn) of daily tracking of head & stable/12 on a > pair of machines (and weekly tracking of stable/12 on another 4), I

RE: CURRENT, usr/src on git, howto "mergemaster"?

> -Original Message- > From: owner-freebsd-curr...@freebsd.org curr...@freebsd.org> On Behalf Of Michal Meloun > Sent: Monday, 4 January 2021 20:47 > To: freebsd-current@freebsd.org > Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? > > >

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 11:42 AM, Marek Zarychta > wrote: … > it's probably high time to stop escalating this thread. Some people like > the way in which mergemaster copes with updates, some people like > etcupdate. With Git clean and smudge filters applied on local repo and > $FreeBSD$ IDs

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 04.01.2021 19:59, Steve Kargl wrote: On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: On Jan 4, 2021, at 10:19, Warner Losh wrote: mergemaster has been on its way out since well before the switch to git. It's been disfavored for at least a decade and basically unmaintained

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 20:27, Enji Cooper pisze: > >> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet >> wrote: > > … > >>> Dear Enji, >>> >>> to satisfy your curiosity: Yes, I have tried etcupdate(8) a few times >>> over years. It works fine, but I don't like the idea of editing >>> conflicted

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 2021-01-04 11:13, Marek Zarychta wrote: W dniu 04.01.2021 o 19:54, Enji Cooper pisze: On Jan 4, 2021, at 10:49 AM, Marek Zarychta wrote: … Terrible idea IMHO, but I am only the weak voice from the userbase. It's like deprecating old, well-worn hammer in the favour of the nail gun.

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 2021-01-04 10:58, Enji Cooper wrote: On Jan 4, 2021, at 10:54 AM, Enji Cooper wrote: On Jan 4, 2021, at 10:49 AM, Marek Zarychta > wrote: … Terrible idea IMHO, but I am only the weak voice from the userbase. It's like deprecating old, well-worn

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet > wrote: … >> Dear Enji, >> >> to satisfy your curiosity: Yes, I have tried etcupdate(8) a few times >> over years. It works fine, but I don't like the idea of editing >> conflicted files. >> >> I won't complain about etcupdate(8), but please

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:59 AM, Steve Kargl > wrote: > > On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: >> >>> On Jan 4, 2021, at 10:19, Warner Losh wrote: >>> >>> mergemaster has been on its way out since well before the switch to git. >>> It's been disfavored for at least a

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 4, 2021 at 12:13 PM Marek Zarychta < zarych...@plan-b.pwste.edu.pl> wrote: > W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta < > zarych...@plan-b.pwste.edu.pl> wrote: > > > > … > > > >> Terrible idea IMHO, but I am only the weak voice

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, 4 Jan 2021 20:13:03 +0100, Marek Zarychta wrote: > W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta > >> wrote: > > > > … > > > >> Terrible idea IMHO, but I am only the weak voice from the userbase. > >> > >> It's like deprecating

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta >> wrote: > > … > >> Terrible idea IMHO, but I am only the weak voice from the userbase. >> >> It's like deprecating old, well-worn hammer in the favour of the nail >> gun. Why not deprecate

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: > >> On Jan 4, 2021, at 10:19, Warner Losh wrote: >> >> mergemaster has been on its way out since well before the switch to git. >> It's been disfavored for at least a decade and basically unmaintained in >> the base for maybe last 5

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:54 AM, Enji Cooper wrote: > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta > > wrote: > > … > >> Terrible idea IMHO, but I am only the weak voice from the userbase. >> >> It's like deprecating old, well-worn hammer in the

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:49 AM, Marek Zarychta > wrote: … > Terrible idea IMHO, but I am only the weak voice from the userbase. > > It's like deprecating old, well-worn hammer in the favour of the nail > gun. Why not deprecate biff(1), pom(6), nvi(1) etc.? Marek, I’m curious: have

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 19:30, Enji Cooper pisze: > >> On Jan 4, 2021, at 10:19, Warner Losh wrote: >> >> On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta >> >> wrote: >> >>> W dniu 04.01.2021 o 17:14, Warner Losh pisze: >>> etcupdate does a full three merge, while mergemaster fakes it in a

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:33 AM, David Wolfskill wrote: > > On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: >> ... >> Adding to this: it has no maintainer, it’s less featureful, and it lacks >> tests. Once I switched to etcupdate a few years back I never looked back at >>

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: > ... > Adding to this: it has no maintainer, it’s less featureful, and it lacks > tests. Once I switched to etcupdate a few years back I never looked back at > mergemaster. > > I honestly think it should be deprecated in 13.x and

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 1/4/21 7:18 PM, Warner Losh wrote: mergemaster has been on its way out since well before the switch to git. It's been disfavored for at least a decade I first heard about this today. While I don't have any opinion on this, shouldn't any reference to it in the instructions in

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:19, Warner Losh wrote: > > On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta > wrote: > >> W dniu 04.01.2021 o 17:14, Warner Losh pisze: >> >>> etcupdate does a full three merge, while mergemaster fakes it in a number >>> of ways. etcupdate directly keeps track of the

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta wrote: > W dniu 04.01.2021 o 17:14, Warner Losh pisze: > > > etcupdate does a full three merge, while mergemaster fakes it in a number > > of ways. etcupdate directly keeps track of the resolutions, which is why > > $FreeBSD$ doesn't matter so much

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 17:14, Warner Losh pisze: > etcupdate does a full three merge, while mergemaster fakes it in a number > of ways. etcupdate directly keeps track of the resolutions, which is why > $FreeBSD$ doesn't matter so much to it. > > mergemaster is deprecated and will likely be removed

Re: CURRENT, usr/src on git, howto "mergemaster"?

> I do not remember mergemaster having a bootstrap stage in setting > it up, a stage that should be executed before /usr/src (or whatever) > is updated. So the procedures are different overall. etcupdate does a 3-way merge. What I did to replace mergemaster with etcupdate was: rm -fr

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 4, 2021 at 5:57 AM Matthew Seaman wrote: > On 04/01/2021 12:29, David Wolfskill wrote: > > > Caveat: Since the switch, I have yet to encounter a case where I needed > > to merge a change in (e.g., because of a newly-created user, or there > > was a commit to /etc/crontab or

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 14:32, David Wolfskill pisze: > On Mon, Jan 04, 2021 at 05:22:10AM -0800, Jeffrey Bouquet wrote: >> ... >> after checking out stable/12 with git, here a >> # cd /usr/src/usr.sbin/mergemaster >> # sh ./mergemaster.sh -piPcv >> >> and then answering 'l' for left for most

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 05:22:10AM -0800, Jeffrey Bouquet wrote: > ... > after checking out stable/12 with git, here a > # cd /usr/src/usr.sbin/mergemaster > # sh ./mergemaster.sh -piPcv > > and then answering 'l' for left for most merges > it seems to have sufficed. > This was before

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, 4 Jan 2021 12:57:43 +, Matthew Seaman wrote: > On 04/01/2021 12:29, David Wolfskill wrote: > > > Caveat: Since the switch, I have yet to encounter a case where I needed > > to merge a change in (e.g., because of a newly-created user, or there > > was a commit to /etc/crontab or

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 04/01/2021 12:29, David Wolfskill wrote: Caveat: Since the switch, I have yet to encounter a case where I needed to merge a change in (e.g., because of a newly-created user, or there was a commit to /etc/crontab or /etc/newsyslog.conf). I may find things rather "more interesting" when that

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 12:35:28PM +0100, Hartmann, O. wrote: > Now, since /usr/src has been siwtched to git on several boxes and the former > svn tag > $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) > supposed to > "mergemaster"? > > I did a full "mergemaster -CUFi"

CURRENT, usr/src on git, howto "mergemaster"?

Now, since /usr/src has been siwtched to git on several boxes and the former svn tag $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) supposed to "mergemaster"? I did a full "mergemaster -CUFi" lately and did the same again, but when mergemaster ran the second (or n-th)