Date: Tue, 30 Jun 2020 23:29:38 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: =?utf-8?Q?Stefan_E=C3=9Fer?= <se@FreeBSD.org> Cc: Ed Maste <emaste@freebsd.org>, John Baldwin <jhb@freebsd.org>, Eric van Gyzen <eric@vangyzen.net>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: 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... Message-ID: <41B27C33-D023-453B-9DED-5776BE059F56@FreeBSD.org> In-Reply-To: <54915302-fad6-730c-8ce7-01c70e97fb6a@freebsd.org> References: <202006271202.05RC22oR085945@repo.freebsd.org> <2b7f0d0f-e243-9c9c-f1c0-e700e0bf6d48@FreeBSD.org> <577b1bd1-598a-d3f9-3c23-537b9747612a@vangyzen.net> <8670f956-1ed4-2b87-ee64-d04bc37d6810@freebsd.org> <ad53e8a5-b816-82bf-3bc7-41696c77d08a@FreeBSD.org> <CAPyFy2CMOQ7-k7m_X12PUrSa%2Bz51y%2BV9fMeLjCn9RJ3645m_CQ@mail.gmail.com> <54915302-fad6-730c-8ce7-01c70e97fb6a@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_C8D930B8-E2F6-4776-A006-22D57730CC9F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 30 Jun 2020, at 22:01, Stefan E=C3=9Fer <se@FreeBSD.org> wrote: >=20 > Am 29.06.20 um 20:09 schrieb Ed Maste: >> On Mon, 29 Jun 2020 at 11:27, John Baldwin <jhb@freebsd.org> wrote: >>>=20 >>> 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. >>=20 >> 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. >=20 > $ cd /usr/svn/base/head/contrib/bc >=20 > $ 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' This is because you are supposed to commit stuff to ^/base/vendor/xxx first, then svn cp it to ^/head/contrib/xxx, at least from Subversion 1.8 onwards. The 'cp' action establishes the ancestral relation. Some of our older contrib areas were imported using cvs2svn, and these also suffer the same problem, i.e. Subversion complains that the vendor and contrib areas are not ancestrally related. > Adding the option --ignore-ancestry to the merge command does not = help. ... > Any idea how to merge from the vendor area in this situation? As far as I know, you have these alternatives: * Delete the contrib/bc tree, and do a fresh svn cp from the vendor area. You will have to apply any customizations on top again. I did something like this to fixup contrib/libc++ in https://svnweb.freebsd.org/base?view=3Drevision&revision=3D287679 * Figure out the right value of the svn:mergeinfo property, and apply that by hand, using svn propset. This will be tricky, and has to be re-done manually every time you want to merge again. * Merge with Subversion 1.7 or earlier. * Ignore all this, merge patches by hand and wait for the Git transition to be completed. -Dimitry --Apple-Mail=_C8D930B8-E2F6-4776-A006-22D57730CC9F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXvuuwgAKCRCwXqMKLiCW o0/nAKC8wDBpcrn8hEK5ngW9G+xQoaI4QQCfUMIlHiagagOueHflQU9O7oKbLLQ= =HtSP -----END PGP SIGNATURE----- --Apple-Mail=_C8D930B8-E2F6-4776-A006-22D57730CC9F--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41B27C33-D023-453B-9DED-5776BE059F56>