Øyvind Harboe wrote: > I am struggling a bit following the above, but I think we agree: > > - development goes on in master like it always has done > - you create a fork at the openocd mirror and create a > release branch there. > You pick whatever you want from the master branch or whatever patches > posted that you think should go in and generally run the > release cycle. > - once you're done with the release, I pull it from you and push it to > the official openocd repository.
Just my 2 cents: This sounds like a bad idea to me if I understand right. It means the release versions will always be in branches that either do, or don't, get merged back into master. If they don't get merged back in, then future releases are not direct descendants of older releases. That is not good for history review or trying to understand where a bug comes in, you can't bisect between version n and n+1. If they do get merged in then you end up with messy history and again difficult to bisect and isolate problems if something breaks when merging in the release version. I would suggest better would be to do all releases from master in a linear fashion, going into feature freeze as needed. At the close of a merge window new development would continue on another branch, "next" or "staging" or whatever. After tagging and releasing, the development branch would be rebased onto the master, giving a linear history. I think this is more or less how other projects including Linux do it. It takes a bit more thought and familiarity with git but results in a much cleaner more usable history. -- Jon Povey [email protected] Racelogic is a limited company registered in England. Registered number 2743719 . Registered Office Unit 10, Swan Business Centre, Osier Way, Buckingham, Bucks, MK18 1TB . The information contained in this electronic mail transmission is intended by Racelogic Ltd for the use of the named individual or entity to which it is directed and may contain information that is confidential or privileged. If you have received this electronic mail transmission in error, please delete it from your system without copying or forwarding it, and notify the sender of the error by reply email so that the sender's address records can be corrected. The views expressed by the sender of this communication do not necessarily represent those of Racelogic Ltd. Please note that Racelogic reserves the right to monitor e-mail communications passing through its network _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
