From owner-freebsd-hackers@FreeBSD.ORG Sun Sep 2 19:40:30 2012 Return-Path: Delivered-To: freebsd-hackers@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A75E106564A; Sun, 2 Sep 2012 19:40:30 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 196078FC14; Sun, 2 Sep 2012 19:40:29 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.5/8.14.5) with ESMTP id q82JeRRP015999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 2 Sep 2012 21:40:27 +0200 (CEST) (envelope-from uqs@FreeBSD.org) Date: Sun, 2 Sep 2012 21:40:27 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Artem Belevich Message-ID: <20120902194027.GP1202@acme.spoerlein.net> Mail-Followup-To: Artem Belevich , Bryan Drewery , Garrett Cooper , freebsd-hackers@freebsd.org, Daniel Hagerty References: <20546.21240.597457.60612@perdition.linnaean.org> <20546.39472.989246.974755@perdition.linnaean.org> <5042AD73.3060402@shatow.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Garrett Cooper , freebsd-hackers@FreeBSD.org, Daniel Hagerty , Bryan Drewery Subject: Re: freebsd.org git repositories and svn ids 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: Sun, 02 Sep 2012 19:40:30 -0000 On Sun, 2012-09-02 at 10:40:24 -0700, Artem Belevich wrote: > On Sat, Sep 1, 2012 at 10:03 PM, Artem Belevich wrote: > > On Sat, Sep 1, 2012 at 9:29 PM, Artem Belevich wrote: > >> I've just noticed that freebsd commits on github come with a git note. > >> If you look past the diff of the commit, you will see a note that > >> contains path and revision number. > >> > >> For example: > >> https://github.com/freebsd/freebsd/commit/fa32f1f570be8b878b2965d95b7dbdc37a953938 > >> > >> has a note that says: > >> svn path=/head/; revision=239998 > >> > >> So, information is there, it's just not part of the log message itself > >> unless you add '--show-notes=*' > > Scratch that. SVN metadata in github freebsd repo is very inconsistent. > > head has git-svn-id but no notes (at least I didn't see then on few > randomly picked commits). > > branches have no git-svn-id, but some commits have notes with SVN info > attached to them. > > The bottom line is that for many revisions it will indeed be very hard > to figure out corresponding commit in SVN. I guess I'll be sticking > with gitorious for the time being. If you read the wiki page at http://wiki.freebsd.org/GitWorkflow carefully, you'll note: Known Problems There's still a bug in the converter, that does not incrementally export the svn revision to git commit id mappings to so called git "notes", instead it clobbers them always. This makes it inconvenient to go from svn revision to git commit hash or vice versa. And this is something that is and will be fixed, it's just not high on my priority list. If someone wants to help out, that would be great! Cheers, Uli