Stuart Brorson wrote: > Therefore, I'm making the (possibly unpopular) decision to require > that patches be submitted only against the STABLE_1_X_branch as we > move forward. The reason is that none of the maintainers have the > time or global view required to sort out all the conflicts which have > crept into the development branches. Over the course of time I intend > to clean out the many different branches which are currently in the > gerbv tree. > > Accordingly, if you have previously submitted a patch, please update > from cvs (per above) and rebase your patch off of the > STABLE_1_X_branch and resubmit. This will help everybody keep the > gerbv project on the rails. > > If you are badly burned by this policy, please feel free to resolve > all the conflicts between the stable branch and the development branch > yourself, and submit patches. You may also e-mail me with any other > idea to support both me and your code. I am not trying to > disenfranchise anybody, or throw away anybody's work, but OTOH I do > not have the time or capacity to sort the different branches out > myself, and therefore need your support to keep gerbv moving forward.
Ok, I did just that. I applied all the patches that you committed to the STABLE_1_x_branch branch to the trunk just now. They only took some minor massaging. I figured I complained enough earlier about this I'd better put up or shut up ;) -Dan _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
