From owner-svn-ports-head@freebsd.org Fri Nov 17 10:28:57 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0E39DC0A25; Fri, 17 Nov 2017 10:28:57 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from toco-domains.de (mail.toco-domains.de [IPv6:2a01:4f8:150:50a5::6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B0CC2B72; Fri, 17 Nov 2017 10:28:57 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from [0.0.0.0] (mail.toco-domains.de [IPv6:2a01:4f8:150:50a5::6]) by toco-domains.de (Postfix) with ESMTPA id 1AD261AAF001; Fri, 17 Nov 2017 11:28:55 +0100 (CET) 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... To: Cy Schubert , Adam Weinberger Cc: "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , "svn-ports-head@freebsd.org" References: <20171116182913.8F7CF694@spqr.komquats.com> From: Torsten Zuehlsdorff Message-ID: Date: Fri, 17 Nov 2017 11:28:54 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171116182913.8F7CF694@spqr.komquats.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2017 10:28:57 -0000 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