kicad-developers team mailing list archive
Mailing list archive
Re: suggestion: git branching model
Jonatan Liljedahl <lijon@xxxxxxxxxxxx>, Jon Evans <jon@xxxxxxxxxxxxx>
Wayne Stambaugh <stambaughw@xxxxxxxxx>
Wed, 11 Dec 2019 11:34:45 -0500
addr=stambaughw@xxxxxxxxx; prefer-encrypt=mutual; keydata= mQGiBEM0hxQRBAC2fNh3YOVLu1d5GZ0SbrTNldGiGnCJPLqzEnqFX9v6jmf33TMt6EmSLkl6 Wtfkoj0nVwKxcYmJkA8DX0QAokBkwNIzhSsBzQvthBLIk/5LnPVVKrEXOcL4mUyH1doKlkaE slgJozNa6Av+oavcvD02o1zJOloBbaHlNlyRt7fKswCgtIFlVjWggVH/15KfWk+Qo5JVPbME AIUBAQyL2OAx0n60AWec2WHnO9buHuG0ibtICgUMkE+2MRmYyKwYRdyVwGoIUemFuOyHp0AJ InX4T+vy2E7vkwODqjtMLfIoRkokW74Fi4nrvjlhOAw/vdq/twLbAmR9MOfPTpR4y7kQy1O2 /n+RkkRvh26vTzfbQmrH7cBJhk6aA/9Uwvu3E4zNJgHVZeS0HyWtmR1eOPPRbnkPgJTToX5O KMKzTJI/FX6kT7cFoCamitHrW3BJP4Dx+cMMsa47EGxqVTdbVJ4LjogsXTXxb+0Fn1u4zBdx x3Cer6O7+hqWy7zvpzeC6nSREjqDKa5CgHtv/GLm5uFPOmsjAsnHj2tlBrQmV2F5bmUgU3Rh bWJhdWdoIDxzdGFtYmF1Z2h3QGdtYWlsLmNvbT6IeAQTEQIAOBYhBOffs6CbblRzBkv33BtR cWlZ+CReBQJbFBS2AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEBtRcWlZ+CReMI8A nRbrLkzp7+c2f0vX7sfg4ICX8LAKAJ9uClo4uJajmZa5zZrL2nKdZlUwIrkCDQRDNIcxEAgA gCru+3/aOC6RCjpvYC72wY+d5SmHphC6yeiV2/mOumyt5MLo/Ps2GznZr11JspqFk5K/Zpvp MMLqqjDZ39+50a2iKRQFJ6NlK+hJWMmj6eJygQrCwYo3Gjc6CqfrqUv+8VSnf/i5sIZmtOVA 4ZjML18MuBvMSsNdVLFJd5HNnYb1iOECpvqdPVh/21LLCEw7MUUGGnHBhCrmk2aJe5hFmcSN g4ldBcXrgMQBwf7aMVoobXBMFDb/IENByXn0llB7Gr2IFMRmNS9/p8s/II1Yl2bTqyX4FSz8 cfn7C9KEz7faZ7wzAcpwHFC/zs3JoAjJ0IEKdNUpIwAlKMzT3CzctwADBQf/cxpG28MKyrqk nNmq/8LQLy+x6FSYXBLjxQz9BiBNYeesDZQ6J5UbL1mjpJzMa5tLZypPYo4bbGyR22hrbyDF K7m6AcVaMIJKl98g4ukMutFfAJyRDaREH5Zl/X1P4u1Z/yaAIy9mKaNbaK1/5djNJ5wCTFen TUgAp9xdc30kGkFDdLJFp5uxDY4P0vaZiZdjUCvDM3Zjv5IzpNOfxVqTUBQNUP/BnnKhkk0p DTD6s3X8S+D0rOtEBQ8K0cwERI/E8EFa8nj0TNw4e2MYGR8wg+SxqJ7z5f0zPY0bO6G9DDFB wYCqzzPWGqdAh9vA5971TAbPERtdFybhkurozp2SfYhJBBgRAgAJBQJDNIcxAhsMAAoJEBtR cWlZ+CResHUAniULLCWiT26ieRTl7N2vS6vBo/DuAJ4m7Ss/gyiW6ybTn1ctDXAUgm2QVQ==
KiCad Developers <kicad-developers@xxxxxxxxxxxxxxxxxxx>
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0
On 12/11/19 11:17 AM, Jonatan Liljedahl wrote:
> Ok, good to hear!
> How about moving the new symbol inheritance stuff into such a feature
> branch until it's working? (See
> https://gitlab.com/kicad/code/kicad/issues/3658) I understand it would
> mean less testing, but in its current state it's impossible to test or
> work on anything else since kicad keeps crashing.
It was. I pushed the branch to my personal development repo and made an
announcement on the dev mailing list several weeks ago. AFAIK, only JP
did any testing and replied with a bug fix that he found. During that
time I had a least 3 merge conflicts with the master branch which I had
to fix. Given the effort to fix merge conflicts and the fact that no
one seem to have time to test it, I merged into master to actually get
some testing done. I fixed the first crash bug report within 36 hours.
I will most likely get the next crash report fixed with 24 hours. It's
not as though you are having to wait days or weeks for bug fixes. You
are doing a wonderful job of validating my argument. If the issue is
keeping you from getting work done, please use a build before the
introduction of the new symbol inheritance code or better yet, keep a
copy of the stable version installed on your machine. That's what other
user seem to do without too many issues.
> On Wed, Dec 11, 2019 at 4:26 PM Jon Evans <jon@xxxxxxxxxxxxx> wrote:
>> We already have used temporary branches for major features in the past. I'm sure we'll continue to do this (through gitlab merge requests) where it makes sense - it's a lot of work to keep a feature branch in mergeable state.
>> On Wed, Dec 11, 2019, 10:16 Jonatan Liljedahl <lijon@xxxxxxxxxxxx> wrote:
>>> Good points. However, I still think it might make sense to have at
>>> least one more level of granularity, and use temporary branches for
>>> major changes etc. so that they can be tested before being merged into
>>> master. Simply, to make a merge request for big changes even if done
>>> by one of the core developers. Going back to the 5.1 branch just to
>>> have a non-crashing version of kicad is quite a leap.
>>> On Wed, Dec 11, 2019 at 3:41 PM Wayne Stambaugh <stambaughw@xxxxxxxxx> wrote:
>>>> We have discussed this before and given that very few users would ever
>>>> test the development branch(es), I'm not going to change our branching
>>>> policy. I don't think it's unfair to ask users who are aware that the
>>>> master branch (which is the KiCad development branch) is always in a
>>>> state of flux to deal with a bit of temporary instability in exchange
>>>> for some comprehensive testing of new features. Most users seem willing
>>>> to help with the testing in spite of some minor and sometimes some not
>>>> so minor inconveniences. I think have development branches would just
>>>> slow down how quickly new feature bugs would get fixed.
>>>> On 12/11/19 9:21 AM, Jonatan Liljedahl wrote:
>>>>> Perhaps it would make sense to adopt something like this?
>>>>> In short, all development happens on 'develop' branch and only when
>>>>> this is stable it's merged back to 'master'. One doesn't have to
>>>>> follow the above model strictly, for example a merge into master
>>>>> doesn't need to mean "new version to be released".
>>>>> Another nice thing is that stuff that are work in progress and not yet
>>>>> stable can live in a feature branch until it's stable enough to merge
>>>>> into 'develop'. (For example the new symbol inheritance stuff, which
>>>>> currently makes the master branch a bit unusable)
>>>>> Maybe some of this makes sense, and some not? Just some thoughts while
>>>>> trying to find a point in the master branch history that doesn't crash
>>>>> all the time :)
>>>> Mailing list: https://launchpad.net/~kicad-developers
>>>> Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
>>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>>> More help : https://help.launchpad.net/ListHelp
>>> Mailing list: https://launchpad.net/~kicad-developers
>>> Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>> More help : https://help.launchpad.net/ListHelp