On Sun, Nov 07, 2004 at 08:57:10PM +0100, Andre Poenitz wrote: > Working with branches is a pain, frustrates people and eats into already > scarce resources.
Balderdash, I say! I've worked with code on 3 different branches, simultaneously. The only problem I encountered was remembering which branch's working directory I was in when rapidly hopping from one to the other. Nor is merging a branch and the trunk all that difficult, if you Update Early and Often. Or in this case, Merge Early and Often. No, the only three real problems with branches are: - Unfamiliarity with them, possibly combined with fear of them. - Laziness and/or sloppiness. - Active development on the same piece of code at the same time by 2 or more people. You can mitigate the latter by: a) Becoming Main Owner and Proprietor of the branch. b) Applying patches when Lars does. (Only needed for patches affecting code you're working on. Otherwise, just Merge Early and Often.) And while you may fall into the first category, I doubt you, a core LyX Developer, fall into the second! :)