Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 May 2020 21:33:28 +0200
From:      Jan Beich <jbeich@FreeBSD.org>
To:        Mathieu Arnold <mat@freebsd.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r534295 - head/x11-servers/xwayland-devel
Message-ID:  <v9l2-p8qf-wny@FreeBSD.org>
In-Reply-To: <20200511083241.kyjptz3ctrtebgdr@aching.in.mat.cc> (Mathieu Arnold's message of "Mon, 11 May 2020 10:32:41 %2B0200")
References:  <202005072205.047M5hQE025839@repo.freebsd.org> <20200511083241.kyjptz3ctrtebgdr@aching.in.mat.cc>

next in thread | previous in thread | raw e-mail | index | archive | help
Mathieu Arnold <mat@freebsd.org> writes:

> On Thu, May 07, 2020 at 10:05:43PM +0000, Jan Beich wrote:
>
>> Author: jbeich
>> Date: Thu May  7 22:05:42 2020
>> New Revision: 534295
>> URL: https://svnweb.freebsd.org/changeset/ports/534295
>> 
>> Log:
>>   x11-servers/xwayland-devel: regen patches (gitlab bug)
>>   
>>   -2.24.1
>>   +2.26.2
>
> This is not really a gitlab bug, it is how git format-patch works, it
> appends it version to the patch, so when the version changes, the patch
> changes.
>
> As it is a known caveat of using patch from gitlab instances, it would
> probably be better to put the patches in the files directory instead of
> depending on the hope that the software will be updated and the patches
> will become obsolete before a new version of git comes around.

See https://reviews.freebsd.org/D24810

I prefer vendoring approach because:
- hard to desync between upstream and files/patch-* versions
- other ports/ committers cannot mix in unrelated fixes
- patches are ordered, so can be applied en masse
- low maintenance due to common format and one place to change



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?v9l2-p8qf-wny>