Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Mar 2020 15:32:49 -0400
From:      Ed Maste <emaste@freebsd.org>
To:        =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uspoerlein@gmail.com>
Cc:        Warner Losh <imp@bsdimp.com>, git@freebsd.org
Subject:   Re: Strange commit
Message-ID:  <CAPyFy2BgeP=WxeZeYVS3z%2BgzArJe1h9ofO42O7HvznpLBsBKbg@mail.gmail.com>
In-Reply-To: <CAJ9axoRs9zWXteeDmZ8L1nucBPqqB-WMGuXTRFyVuxo2h4F11w@mail.gmail.com>
References:  <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com> <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com> <CAJ9axoRs9zWXteeDmZ8L1nucBPqqB-WMGuXTRFyVuxo2h4F11w@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein <uspoerlein@gmail.com> w=
rote:
>
> This is intentional, please see https://github.com/freebsd/svn2git/blob/1=
a0b3e0230e1b2430e5d8eb91ac99aeff5a1614d/src/svn.cpp#L883
>
> Only projects and user branches are represented as merges to master, as t=
hey usually have a full tree. This seemed to match the git model better (as=
 opposed to the SVN model).

IMO we do want vendor code updates recorded as merges. This is already
happening today for certain updates (svn merge -c <rev> updates I
believe). For example my most recent ELF Tool Chain vendor update:
https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6ba4=
0c12ac5



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BgeP=WxeZeYVS3z%2BgzArJe1h9ofO42O7HvznpLBsBKbg>