Date: Tue, 24 Sep 2019 10:02:58 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uspoerlein@gmail.com> Cc: Shawn Webb <shawn.webb@hardenedbsd.org>, freebsd-git@freebsd.org Subject: Re: Service disruption: git converter currently down Message-ID: <CAPyFy2BXo7SsFfVM0Y=L2xMo70qm7-FTSo33zDAnGR7vC%2Bk15w@mail.gmail.com> In-Reply-To: <CAJ9axoQ-g2Qa2Qnr%2BPOD63s8sTH2Gsi7Rh2VMcZzQF5dd_kBvA@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> <CAJ9axoSVhmSkNS6S1zTiwK5F3uUM%2B-8D2478=irZMeTjNxpnfg@mail.gmail.com> <20190923183424.ebnghzf67mx56aom@mutt-hbsd> <CAJ9axoQ-g2Qa2Qnr%2BPOD63s8sTH2Gsi7Rh2VMcZzQF5dd_kBvA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 23 Sep 2019 at 14:42, Ulrich Sp=C3=B6rlein <uspoerlein@gmail.com> w= rote: > > Is there really that much value in having "git blame" work in that enviro= nment? > My mental model is of short-lived branches that get upstreamed, so I'm bi= ased > towards this not being all that big of a problem (for some at least). For FreeBSD developers working against the git mirror and committing to SVN I agree it's not much of a concern. But we have a significant number of downstream consumers using the git mirror with long-lived derived branches and churn here is going to be somewhat painful. I suspect your suggestion about merging from both broken and fixed to the derived branch is the most usable solution for folks using a long-lived merge workflow. > I'm 80% sure that you can just merge both branches and things will be fin= e > (though the exact incantation will surely be black magic). I'd love to > try this on > an actual repo though, I don't have the time to craft some test repo to v= erify > this assumption, and then find out that other repos are different). Yes, once we have some time to rerun the conversion (using new branch/merge configuration for the stable/10 issue) we should test this out.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BXo7SsFfVM0Y=L2xMo70qm7-FTSo33zDAnGR7vC%2Bk15w>