On 08/18/2016 04:11 AM, Yann Ylavic wrote:
On Wed, Aug 17, 2016 at 7:08 PM, Jacob Champion <[email protected]> wrote:
What's the procedure for dealing with this in STATUS when I propose
something? A 2.4.x patch hosted... somewhere?
Yes, you can propose a branch merge in a standalone patch, and give a
link to it in a "2.4.x patch: ..." line (otherwise, this line is
usually "trunk works [modulo CHANGES/MMN --which the "merger" can
easily resolve itself]".
That way, the votes refer to the proposed patch, finally simply
applied on the branch (with --record-only for the mergeinfo of trunk
commits).
Ah, didn't know about --record-only; that explains other things for me.
Thanks!
For hosting the patches, it's either an external address (lifetime of
the vote, at least ;) or your own Apache space at
home.apache.org/~yourid/ (you may want to configure your SSH
authorized_keys line on id.apache.org to be able to access it via
sftp).
Thanks (and thanks to Rüdiger too!). The 2.4.x patch is up and reflected
in STATUS now.
Or do we just rely on proper
manual resolution by whoever merges the patches?
Ouch, no one would want to merge :)
Well, I guess if the merges are gigantic and the conflicts are nasty, sure.
Also, votes wouldn't always correspond to the result...
Makes sense.
--Jacob
