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...

[Stefan Eßer]

Am 29.06.20 um 20:09 schrieb Ed Maste:
> On Mon, 29 Jun 2020 at 11:27, John Baldwin <jhb at 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.

$ cd /usr/svn/base/head/contrib/bc

$ svn merge --record-only ^/vendor/bc/dist
svn: E195016: 'svn+ssh://repo.freebsd.org/base/vendor/bc/dist@362810'
must be ancestrally related to
'svn+ssh://repo.freebsd.org/base/head/contrib/bc@362810'

Adding the option --ignore-ancestry to the merge command does not help.

I have performed a clean check-out of base/head and base/vendor, but
the error message stays the same ...


SVN info for the relevant directories involved in the merge attempt:

$ svn info /usr/svn/base/head/contrib/bc /usr/svn/base/vendor/bc/dist
Path: usr/svn/base/head/contrib/bc
Working Copy Root Path: /usr/svn/base
URL: svn+ssh://repo.freebsd.org/base/head/contrib/bc
Relative URL: ^/head/contrib/bc
Repository Root: svn+ssh://repo.freebsd.org/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 362810
Node Kind: directory
Schedule: normal
Last Changed Author: se
Last Changed Rev: 362681
Last Changed Date: 2020-06-27 14:02:01 +0200 (Sat, 27 Jun 2020)

Path: usr/svn/base/vendor/bc/dist
Working Copy Root Path: /usr/svn/base
URL: svn+ssh://repo.freebsd.org/base/vendor/bc/dist
Relative URL: ^/vendor/bc/dist
Repository Root: svn+ssh://repo.freebsd.org/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 362810
Node Kind: directory
Schedule: normal
Last Changed Author: se
Last Changed Rev: 362697
Last Changed Date: 2020-06-27 17:03:19 +0200 (Sat, 27 Jun 2020)


Any idea how to merge from the vendor area in this situation?

Regards, STefan