Date: Thu, 19 Jul 2018 02:36:12 +0200 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 Message-ID: <muuo-qcxv-wny@FreeBSD.org> References: <201807182344.w6INiM7P007498@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?muuo-qcxv-wny>