On Friday 12 March 2010 14:56:30 Stephen Kelly wrote: > > In particular, I would not use a special "Enterprise5-features" branch. > > Rather, I would create a separate feature branch for each feature that > > you invent. Then you can merge the features selectively to "KDE master" > > and "Enterprise5-release".
Actually I think I misread your paragraph when I replied. We'd create a separate branch for each feature and merge that into the e5-features branch. That branch can always be merged into master and e5-release by definition and gives us both a tracking point (if a merge from it is a no-op, the features are already in the target branch) and separation (the features branch contains no BiC hacks, and can always be merged to master). > > The way that you proposed it, you would be able to > > merge features to "KDE master" and "Enterprise5-release" only > > collectively. I don't think this is a problem? It does reduce the number of merge commits onto master, right? -- Stephen Kelly <[email protected]> | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions
_______________________________________________ Kde-scm-interest mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-scm-interest
