Strange commit

Ed Maste emaste at freebsd.org
Wed Apr 8 16:06:09 UTC 2020


On Mon, 6 Apr 2020 at 16:24, Ulrich Spörlein <uqs at freebsd.org> wrote:
>
> Can folks help out a bit on how merginfo is stored and whether it is
> actually stored on the revisions?
>
> svn propget svn:mergeinfo -r337810 is not very useful output (and
> doesn't say anything about /vendor/lua !)

Ah, that's showing just the mergeinfo stored at the top of the tree.
propget on the contrib dir shows the appropriate mergeinfo:
```
$ svn propget svn:mergeinfo -r337810 contrib/lua
/vendor/lua/dist:326353-337809
```

however this still isn't particularly useful for inferring the
merge-from rev in a git revision because 337809 represents the
repository revision at the time the merge was done, but we really care
about the last revision in /vendor/lua/dist at the time of that merge.

I think this is the appropriate merge-from revision:
```
$ svn log -l 1 ^/vendor/lua/dist at 337809
------------------------------------------------------------------------
r337586 | kevans | 2018-08-10 16:05:41 -0400 (Fri, 10 Aug 2018) | 2 lines

Import lua 5.3.5
```


More information about the freebsd-git mailing list