Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2019 09:48:10 -0400
From:      Ed Maste <emaste@freebsd.org>
To:        Sean Chittenden <sean@chittenden.org>
Cc:        =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uspoerlein@gmail.com>,  freebsd-git@freebsd.org
Subject:   Re: Service disruption: git converter currently down
Message-ID:  <CAPyFy2AMqft2EwdZHYnFUOFxSDOmN1Rv0A9jnR3VdE38SP87pw@mail.gmail.com>
In-Reply-To: <CAHevUJHwDet8pBdrE4SN3nuoAUgP-ixpCz9uOTdwbE31UDDsbA@mail.gmail.com>
References:  <CAJ9axoR41gM5BGzT-nPJqqjym1cPYv31dDUwXwi4wsApfDJW%2Bw@mail.gmail.com> <CAJ9axoToynYpF=ZdWdtn_CkkA2nVkgtckQSu%2BcMis1NOXgUdnA@mail.gmail.com> <CAJ9axoR2VXFo9_hx9Z1Qwgs7U-dkan56hrUKO9f7uN6Wpd15xQ@mail.gmail.com> <CAHevUJHwDet8pBdrE4SN3nuoAUgP-ixpCz9uOTdwbE31UDDsbA@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 23 Sep 2019 at 13:51, Sean Chittenden <sean@chittenden.org> wrote:
>
> >
> > Please note however, that more "garbage" metadata escaped from SVN into
> > github, meaning 3rd parties have a hard time re-running the conversion and
> > making sure that it matches SVN down to the metadata (i.e. timestamps).
> >
> Discussion of a force-push to github has occurred a few times and been
> explicitly ruled out because most of our corporate citizens use github to
> integrate changes from FreeBSD.

Unfortunately it's not just a few instances of bogus metadata (commit
timestamps and authors), there are also a cases where the git
conversion misrepresents the operation performed and makes for
confusing history.

One example of this is r306097 / df422cbea30e. A file that had been
removed in head needed to be restored, and in SVN it was done by
copying from the stable/10 branch. The git converter interpreted that
as a merge, and then grafted the post-branch stable/10 history into
head as a result. That is why we have a bit over 9000 stable/10
commits showing up in 'git log origin/master'.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2AMqft2EwdZHYnFUOFxSDOmN1Rv0A9jnR3VdE38SP87pw>