On Wednesday 15 of October 2014 17:39:06 Darrell wrote:
I appreciate the discussion about branching. I prefer
a different view: no
branches. Just leave git as-is. Patches affecting post R14.0.0 are not
pushed to git. If inadvertently pushed, those patches are reverted until
post R14.0.0. Attach all post R14.0.0 patches to a respective bug report
with a note not to push until post R14.0.0.
If uncertain during the freeze period, push privileges could be temporarily
suspended or limited to two people.
The whole branching topic makes my head hurt. Based on the discussion I
suspect my head is not the only that spins. Planes circle airports waiting
to land because there is a limited number of usable runways. Use the same
analogy for pushing patches. Where is the rush? Especially considering how
long many Trinity patches tend to sit untouched in bug reports anyway.
Regarding the three unfinished bug reports, just finish them. Again, where
is the rush?
Darrell
I dare say that the work on v3.5.13-sru branch are obvious proof that it is
not a good idea to consider option 1) do not use branches at all.
--
Slávek