trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: December 2014

Re: [trinity-devel] Rules for commit patches to r14.0.x branch

From: Michele Calgaro <michele.calgaro@...>
Date: Wed, 17 Dec 2014 12:41:28 +0900
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2014/12/17 10:38 AM, Slávek Banko wrote:
> On Wednesday 17 of December 2014 02:22:40 Timothy Pearson wrote:
>>> Hi all,
>>> 
>>> while working on v3.5.13.x was a rule that the patches have 
>>> always been first pushed to the master branch and then 
>>> cherry-picked to v3.5.13-sru branch (with necessary 
>>> modifications). Directly to v3.5.13-sru patches were pushed 
>>> very rarely - if they were specific to v3.5.13.x. As an 
>>> example, the current patch for setting the target release in 
>>> tdelibs.
>>> 
>>> I suppose for r14.0.x branch I will not be alone, who will 
>>> incorporate patches into this maintenance branch, so I would 
>>> like to determine, whether we will work also on r14.0.x branch 
>>> under these rules?
>> 
>> I see no reason to change these rules; they ensure that the 
>> patches are incorporated into mainline and tested before 
>> application to the backport branches.
>> 
>> Tim
>> 
> 
> Yes, I see it the same way. I just wanted to confirm that, Michele 
> will proceed patches in the same way :)
> 

Sounds good to me too and don't see any reason to change that. One
question I have is: after a bug fix has been pushed to the main trunk,
do we have to wait for a given amount of time before pushing to the
r14.0.x branch, to allow for testing? Or can we cherry-pick and push
to r14.0.x immediately?

Cheers
  Michele
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJUkPtnAAoJECp1t8qK3tXPBkYP/i4oQjiIcs3Ag1z4VPV91O8/
mwYwqhICbKX2atbvrKT6nVMhimjsqivAicvMldZG8BwBl10NJvOVOFJdE2y1go/b
xGN+Wly44D3g5LP17/nn2pEVucFoMbtTZjuCyc1LoJCkLkC9nC3XrdOIObt9KXXe
CgOpkRNxlCCgpEkFdvdZqdCqIstQXJje4y2eoMcywU6d64EYX0sPFOZ6YifQvfNG
GVUWGWZx9muJfvE8x/A5SsrEObS8J48y5AZoH28jI1w2vRgEwJomH0tHPx0SW85F
Xj8/qnaXVDKQAOZntPluiV8KKicNvy7Th3SAMclXoZi0KZuHPC7SBQQEy7dPyPJK
syQXG8I48Yc1BEDY1StSRjFdhfkbNjJRAGb5oCDld6J4sf1vL+Vd90UG1YB1hJ/a
AAkCXIDAFUm2be2QgmBtsgdh26ywKin3ChZYBq9SHq0GTGORViUCoYl7W7QCaLvP
iVnvH5SvmHdMMSjs2oWXjB+wF8+yzr1eY2UveBZcnFxiy5eieOT7LoIrDUUJ5ZWl
uUAP5bvsJgTXS2oguyEgrO1pDitWohd5K2vztXa8e48g9QGMpEyBrkQg/4qieFMN
4kC/lSnYLffcOuSfDcO+Ai6VSIckm3vRkJRMj3YHOsudOzXgq5BSjlB5v+sntVyP
w+qVXUEEa/cbwfmw8SDd
=ph8l
-----END PGP SIGNATURE-----