17 Dec
2014
17 Dec
'14
12:40 a.m.
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?
Michele, what is your opinion?
--
Slávek
17 Dec
17 Dec
1:22 a.m.
New subject: [trinity-devel] Rules for commit patches to r14.0.x branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA224
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iFYEARELAAYFAlSQ2uAACgkQLaxZSoRZrGHw1gDfUNYNqMtV0c3tyWLLGT3p+ccH
X/lK5zJedYpzwgDfX9pfRD5wda0pQ6wSyrMET4U9eKWu1O5EdNPHGA==
=t8+n
-----END PGP SIGNATURE-----
1:38 a.m.
New subject: [trinity-devel] Rules for commit patches to r14.0.x branch
On Wednesday 17 of December 2014 02:22:40 Timothy Pearson wrote:
Yes, I see it the same way. I just wanted to confirm that, Michele will
proceed patches in the same way :)
--
Slávek
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
3:41 a.m.
New subject: [trinity-devel] Rules for commit patches to r14.0.x branch
-----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:
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
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
-----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-----
18 Dec
18 Dec
7:55 p.m.
New subject: [trinity-devel] Rules for commit patches to r14.0.x branch
On Wednesday 17 of December 2014 04:41:28 Michele Calgaro wrote:
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
I would say that for simple patches that clearly fix bugs may be patches
cherry picked and pushed immediately. For more complex patches we can use
validation and approval by a second pair of eyes. Similarly, as it did after
the soft-freeze for R14.0.0.
--
Slávek
19 Dec
19 Dec
3:34 a.m.
New subject: [trinity-devel] Rules for commit patches to r14.0.x branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12/19/2014 04:55 AM, Slávek Banko wrote:
For more complex patches we can use validation and
approval by a second pair of eyes. Similarly, as it did after
the soft-freeze for R14.0.0.
Good idea. If a bug fix is somehow complex, we push it to the main trunk, then we can send
an email to the TDE dev
list or within developers asking for double checking the changes. Then the original commit
can be cherry-picked in the
R14.0.x branch.
Cheers
Michele
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBAgAGBQJUk5ypAAoJECp1t8qK3tXPpxkP/1TrZdbzj7KBjW79Uml88mce
FwEF08013pvZU8m66690ylaik2pR7PY63rZCmM1DdQulSaG5OT/eyZWur09XmFE1
KbUtlNe354pmZoHqzRmD/x9ee6m5JiYsInE04cw6j62X1YLv7R/OrOgEeAPIcpbr
9blRhju0RDF6GLyBX05sa8pEf9Az5X3YSRSco9b84cQV343ZbQX3wVwp7t6z1k0p
lBAxHtwTKPO6lyi5T8HI0P4s6aDN6mTQZMSpdDsFpwuOfSG1erElmrZv1+TAvVYs
yY2kUEkRmL4XqwNTPKvJLJbGtrwLTDiNs0CxOoB9O3Q0lcNgUIBZccLLL4cXCKLj
m1Yx+812RgVaJRJVThN4vYpozKTU+s1VJtug2LEvqHIhyQGqvBiuSsuZ5u2vZgqC
tYSNyFZzT+/V5D7hh7JQ6lg5I1dQcYo1Za0mqwzM4UF44KVG4DtFWKql4sAm1hK5
Qsc4GlGU86xu0YwPoYXL3JT3d5VRFvk6eknCKPDqEEyl2pWittriF2sO9ApJXxdk
3588cLZsk7rieiF9iZYauk6Az4J0Ss0sad6wtU3fxIioUpeDZSuTBo9b6oTShZlo
WFITVE9ppv7NifqTv3uHicQWTGma1+mw8KzYR2vZlFQ01VzjSog/CHE7FOOtvO9+
cwjnmF9hdNOLV2uq0Ct/
=lRoI
-----END PGP SIGNATURE-----
3625
days inactive
3627
days old
5 comments
3 participants
participants (3)
-
Michele Calgaro -
Slávek Banko -
Timothy Pearson