From owner-freebsd-hackers@FreeBSD.ORG Tue Sep 20 15:34:06 2011 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 459AC1065670 for ; Tue, 20 Sep 2011 15:34:06 +0000 (UTC) (envelope-from artemb@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 06A208FC08 for ; Tue, 20 Sep 2011 15:34:05 +0000 (UTC) Received: by gyf2 with SMTP id 2so555960gyf.13 for ; Tue, 20 Sep 2011 08:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=ZEbJkvcDE7cZphV/JNfw8wqA6lEQblr6448rdcD/krI=; b=skTRoohpy1sj/urpJCOEvfRRsEHdGNC8TorpOjbpXIgAKzZ9pv/4orrW3V/F81pUMZ s2YV+W0Lx6I32wi5iiUVCOilnvHhunUete70NUNoKERsEjHlv8O3POxAkgNkAMv7/cta SgnbOpOoZkJz9oPj5qm7IbfSnCfndQ/zlxfwg= MIME-Version: 1.0 Received: by 10.236.187.36 with SMTP id x24mr5384828yhm.74.1316531129048; Tue, 20 Sep 2011 08:05:29 -0700 (PDT) Sender: artemb@gmail.com Received: by 10.236.102.147 with HTTP; Tue, 20 Sep 2011 08:05:28 -0700 (PDT) In-Reply-To: References: <4E712D11.7040202@FreeBSD.org> <4E75B67E.1000802@FreeBSD.org> Date: Tue, 20 Sep 2011 08:05:28 -0700 X-Google-Sender-Auth: C_EKBBqqVH26igoLeM_XE-YA8X8 Message-ID: From: Artem Belevich To: Fabien Thomas Content-Type: text/plain; charset=ISO-8859-1 Cc: hackers@freebsd.org, Andriy Gapon , Arnaud Lacombe Subject: Re: my git development snapshot(s) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2011 15:34:06 -0000 On Tue, Sep 20, 2011 at 6:34 AM, Fabien Thomas 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