On 29/06/2020 16:11, Stefan Eßer wrote:
Am 29.06.20 um 20:09 schrieb Ed Maste:
On Mon, 29 Jun 2020 at 11:27, John Baldwin <j...@freebsd.org> wrote:
I suspect just doing the 'merge --record-only' is the simplest method
assuming Git handles it ok. I suspect since Git ignores mergeinfo this
is fine, but it would be good for Ed to confirm. You can always restore
the tests in the future in contrib/bc when you want to add them.
I think a --record-only merge is the best approach; in any case we
have a number of these in the tree already and Git will have to deal
with them.
Thank you for this advice.
There is a new version, which differs only in the man-pages. These
used to mention optional features (of which only NLS support is
actually optional in the version built on FreeBSD, all other are
always compiled in, and I had mentioned to the author that this
might irritate FreeBSD users).
FWIW, since it was rewritten it would have been actually nice to have it
in modern C++.
I have suggested to the author to add SPDX BSD-2-Clause tags, which
would change a large fraction of the currently committed files.
We only use the SPDX tags for internal software. For stuff from contrib
it is not necessary.
Is it required to perform the --record-only merge, then?
Since you are going to bring it through the vendor area you should keep
the merge information yes.
Or would it be OK to import the new release into the vendor branch
and then svn copy that version completely (including the tests and
other files that I had omitted in the initial import) to contrib?
I expect the svn copy without prior svn merge --record-only to
result in the same repository state after the conversion to Git,
but I do not really know ...
It is likely git won't care.
cheers,
Pedro.
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
