<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">On Friday 12 March 2010 14:56:30 Stephen Kelly wrote:<br>
> > In particular, I would not use a special "Enterprise5-features" branch.<br>
> > Rather, I would create a separate feature branch for each feature that<br>
> > you invent. Then you can merge the features selectively to "KDE master"<br>
> > and "Enterprise5-release".<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>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).<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>> > The way that you proposed it, you would be able to<br>
> > merge features to "KDE master" and "Enterprise5-release" only<br>
> > collectively.<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>I don't think this is a problem? It does reduce the number of merge commits onto master, right?<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>-- <br>
Stephen Kelly <stephen@kdab.com> | Software Engineer<br>
KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company<br>
www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090<br>
KDAB - Qt Experts - Platform-Independent Software Solutions</p></body></html>