From owner-svn-ports-head@freebsd.org  Thu Jul 19 00:36:18 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCA20103E4D3;
 Thu, 19 Jul 2018 00:36:18 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 95A3174D44;
 Thu, 19 Jul 2018 00:36:18 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id 8E48A10A32; Thu, 19 Jul 2018 00:36:18 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: ports-committers@freebsd.org
Cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject: Re: svn commit: r474920 - head/mail/thunderbird/files
References: <201807182344.w6INiM7P007498@repo.freebsd.org>
Date: Thu, 19 Jul 2018 02:36:12 +0200
Message-ID: <muuo-qcxv-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jul 2018 00:36:19 -0000

Jan Beich <jbeich@FreeBSD.org> writes:

> Author: jbeich
> Date: Wed Jul 18 23:44:21 2018
> New Revision: 474920
> URL: https://svnweb.freebsd.org/changeset/ports/474920
>
> Log:
>   mail/thunderbird: drop patches in preparation for update
>   
>   $ svn commit
>   Sending        Mk/Uses/gecko.mk
>   Sending        mail/thunderbird/Makefile
>   Sending        mail/thunderbird/distinfo
>   Sending        mail/thunderbird/files/patch-addon-search
>   Replacing      mail/thunderbird/files/patch-bug1021761
>   Adding         mail/thunderbird/files/patch-bug1144632
>   Deleting       mail/thunderbird/files/patch-bug1186967
>   [...]
>   Transmitting file data ..........done
>   Committing transaction...
>   svn: E165001: Commit failed (details follow):
>   svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
>   Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug702179"
>   == Additional errors may compound and may not be accurate ==
>   Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1021761"
>   Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1288587"
>   Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug847568"
>   Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-env-api-keys"
>   [...]

In order to preserve file history portmgr@ encourages to use repocopy.
This commit tried to switch to granular history only to be blocked by
pre-commit hook requesting to squash into a blob. It may have been
possible to losslessly merge thunderbird/files and firefox-esr/files
histories but this isn't documented in Committer's Guide and is likely
to result in mergeinfo contamination on /head branch.

Anyway, Subversion metadata is hard. I should probably stop venturing
out of my Git workflow as it takes too much time to resolve.