Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Sep 2012 21:40:27 +0200
From:      Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@FreeBSD.org>
To:        Artem Belevich <art@FreeBSD.org>
Cc:        Garrett Cooper <yanegomi@gmail.com>, freebsd-hackers@FreeBSD.org, Daniel Hagerty <hag@linnaean.org>, Bryan Drewery <bryan@shatow.net>
Subject:   Re: freebsd.org git repositories and svn ids
Message-ID:  <20120902194027.GP1202@acme.spoerlein.net>
In-Reply-To: <CAFqOu6iih94rPLn2fZx73QivpyRa103D3Nn2_wpG1ORh=r472A@mail.gmail.com>
References:  <20546.21240.597457.60612@perdition.linnaean.org> <CAFqOu6hh4Yz0dSmpsP4x3FsruH%2Bid1va=kZW4brTQ0V_J4SnKw@mail.gmail.com> <20546.39472.989246.974755@perdition.linnaean.org> <CAGH67wSp3AXRvyDr1R6krihni6Bqi1HaHkzocKAJ%2B6bTCW2vBg@mail.gmail.com> <5042AD73.3060402@shatow.net> <CAFqOu6jM3junPBzj_cJRrfN7VaOkVM-CLCpUsPficDXOcLyy0Q@mail.gmail.com> <CAFqOu6jNboi-u3umqB%2BSkBX_ZVNMzWR-F83k8DnnugXOOdVDLQ@mail.gmail.com> <CAFqOu6iih94rPLn2fZx73QivpyRa103D3Nn2_wpG1ORh=r472A@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 2012-09-02 at 10:40:24 -0700, Artem Belevich wrote:
> On Sat, Sep 1, 2012 at 10:03 PM, Artem Belevich <art@freebsd.org> wrote:
> > On Sat, Sep 1, 2012 at 9:29 PM, Artem Belevich <art@freebsd.org> 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



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