svn commit: r362681 - in head: contrib/bc contrib/bc/gen contrib/bc/include contrib/bc/locales contrib/bc/manuals contrib/bc/src contrib/bc/src/bc contrib/bc/src/dc contrib/bc/src/history contrib/b...

[John Baldwin]

On 6/28/20 1:28 AM, Stefan Eßer wrote:
> I could delete what's currently in contrib/bc and use svn copy to make
> the whole contents of vendor/bc/dist available in contrib/bc. The tests
> require 1112 KB of space, while the rest of the sources takes up less
> than 900 KB.
> 
> I could revert the full import to contrib/bc, but that would also revert
> changes to e.g. usr.bin/Makefile and I'd rather remove just what's now
> in contrib/bc and then use svn copy to make vendor/bc/dist available
> there. The sources from the dist directory can be used unmodified, the
> reason for cherry-picking was just that I did not want to import more
> than is used at this time ...

I do not think you should do a full revert but just fixup contrib/bc.
I think it would be good to get advice from emaste@ about what is most
Git-conversion-friendly.  You might be able to just do a 'svn merge --record-only'
to bootstrap the merge info and commit that.  Barring that, you might
be able to svn rm contrib/bc and then 'svn cp' it from the vendor area.
You'd probably have to do that as two separate commits to make use of a
URL for the 'svn cp' though which would break the tree for one commit.

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.

-- 
John Baldwin