On Sat, Jul 4, 2015 at 2:36 PM, Peter Stuge <pe...@stuge.se> wrote: > C Bergström wrote: > >> 2) merge commits lead to multiple parents, which breaks a clean and >> simple to follow linear history > > This is either a bug or a feature depending on whether development > was actually linear. Sometimes it is, but sometimes it isn't. >
This is really the crux of it. This debate has been running on IRC and the lists for well over a year now. I think the proposed workflow on the wiki is as good as any I've seen. In six months we'll probably decide to change it, but I couldn't tell you how today. I'd rather see us move to git and work this stuff out vs just debate the topic endlessly on the lists. The existing cvs structure has its own share of pros and cons. The history is a lot cleaner when you look at individual files. On the other hand, when you look at tree-wide commits it is a complete mess. Even with merges it will be a LOT easier to separate out changes with git. -- Rich
