Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Nov 2017 11:28:54 +0100
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        Cy Schubert <Cy.Schubert@komquats.com>, Adam Weinberger <adamw@adamw.org>
Cc:        "ports-committers@freebsd.org" <ports-committers@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>
Subject:   Re: svn commit: r454302 - in head: Mk Mk/Uses archiversarchivers/php72-bz2 archivers/php72-phar archivers/php72-ziparchivers/php72-zlib converters converters/php72-iconvconverters/php72-mbstring con...
Message-ID:  <b40e3cc9-8cdf-3674-2e30-bf1d7608940b@FreeBSD.org>
In-Reply-To: <20171116182913.8F7CF694@spqr.komquats.com>
References:  <20171116182913.8F7CF694@spqr.komquats.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On 16.11.2017 19:29, Cy Schubert wrote:
> Would using a project branch or even applying a diff to freshly 
> repocopied sources have helped. This is of course a PITA which itself 
> can introduce errors due to mispatch.

No. The error i made slipped through because the patch was so massive 
and i did a human mistake which wasn't catched in reviews.

But there is one technical problem: the repo-copy did not get updated 
with a svn update. That is a limitation of svn. So i needed to scan 
every commit for changes of PHP 7.1 and either migrate them manually or 
redo the repo-copy.

> Another point: on one project I had to switch from git to svn because 
> git doesn't support an svn copy function.

Yes. While the current structure of our repo makes it hart to use a svn 
branch at all.

> How is the best way to handle this type of situation without creating 
> diffs and reapplying them to a different or new tree in order to 
> correctly preserve history?

There is also a third problem i want to mention:
A diff does not show a repo-copy. This means i need to use 
--show-copies-as-adds to create a patch review. Last time PHP 7.1 this 
had hidden the fact i did not do a repo-copy for everything.

Sadly i did not know any code-repository or revision-tool which solves 
this problems.

Greetings,
Torsten



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b40e3cc9-8cdf-3674-2e30-bf1d7608940b>