Date: Tue, 20 Sep 2011 08:05:28 -0700 From: Artem Belevich <art@freebsd.org> To: Fabien Thomas <fabient@freebsd.org> Cc: hackers@freebsd.org, Andriy Gapon <avg@freebsd.org>, Arnaud Lacombe <lacombar@gmail.com> Subject: Re: my git development snapshot(s) Message-ID: <CAFqOu6hCAcCHvt-Qaaky5K3TEfbpfZi1gLnRq6RvXvzK=AdMyA@mail.gmail.com> In-Reply-To: <D616D51E-6DD2-4C15-BE04-4CF2C818DABA@netasq.com> References: <4E712D11.7040202@FreeBSD.org> <4E75B67E.1000802@FreeBSD.org> <CACqU3MUVJ%2BhmNKLGXaT1W3tUQjXc2PL3qSAJ3ni0UzKbXVc3Wg@mail.gmail.com> <D616D51E-6DD2-4C15-BE04-4CF2C818DABA@netasq.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Sep 20, 2011 at 6:34 AM, Fabien Thomas <fabien.thomas@netasq.com> wrote: > git merge-base upstream/svn_trunk upstream/svn_stable_8 > does not work. Ditto here. > > it seems that at some point in time it was working. > (upstream = live tree, origin = my sandbox) > I will need to dig a little more to understand the problem. Here's an observation that may be relevant. Some time back repository had much deeper history. Then at one point remote branches got forcefully updated during 'git fetch origin'. Once that happened, new svn_stable_8 branch had completely separate one from the one that was in the clone before the fetch. History also got trimmed and would only go as deep as ~2009. I suspected that history depth was trimmed in the original repository. The same trim could've 'disconnected' branches from the trunk, too. --Artem
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFqOu6hCAcCHvt-Qaaky5K3TEfbpfZi1gLnRq6RvXvzK=AdMyA>