Date: Wed, 1 Jul 2020 08:43:01 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: =?utf-8?Q?Stefan_E=C3=9Fer?= <se@FreeBSD.org> Cc: 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: <CB92B66D-A9E6-4872-B8B5-E4A6AF405DDA@FreeBSD.org> In-Reply-To: <b1b73cdc-9f03-1644-6192-df25fb4e9ee7@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> <41B27C33-D023-453B-9DED-5776BE059F56@FreeBSD.org> <b1b73cdc-9f03-1644-6192-df25fb4e9ee7@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_3C88A624-DCD5-40D9-914D-7ED2C75C30C5 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 1 Jul 2020, at 00:03, Stefan E=C3=9Fer <se@FreeBSD.org> wrote: >=20 > Am 30.06.20 um 23:29 schrieb Dimitry Andric: ... >> 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. >=20 > Yes, I thought so - the problem I want to fix is the premature import > to /contrib and I had been hoping that it was possible to use the > --record-only merge to edit the merge history (as suggested by John > Baldwin and Ed Maste). I have never been able to find a way to 'force' the ancestral relation after the fact. Subversion does not seem to expose this as a user-manipulable property. The --record-only option does what it says, i.e. not actually merging but only updating the svn:mergeinfo property, but it will still only work on ancestrally related objects. > I want to upgrade to the next release and I'm wondering whether it > would be possible to just svn copy that new version over from the > vendor directory to the contrib directory. The import to the vendor > area and the contrib directory have very similar commit messages and > thus there would be no loss of commit history. If you don't have many (or no) customizations, then indeed it will be fairly easy. In one commit, you can svn rm the old version, and svn cp the new version from the vendor area. Subversion will later show the directory to have been "Replaced". There are lots of examples of this in the tree, and I would hope the Git converter can handle it, or there will be much more trouble. :) -Dimitry --Apple-Mail=_3C88A624-DCD5-40D9-914D-7ED2C75C30C5 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 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXvwwdQAKCRCwXqMKLiCW oxLDAKDAtnHYXklpnJnWzDsOL1G0M0392ACfUvf+NS6GVg7/qr+O6OotJwIucKI= =nynS -----END PGP SIGNATURE----- --Apple-Mail=_3C88A624-DCD5-40D9-914D-7ED2C75C30C5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CB92B66D-A9E6-4872-B8B5-E4A6AF405DDA>