From: Jeff H. <je...@ac...> - 2011-03-09 17:40:19
|
How do you modify this behavior for backporting? A common and necessary step as many people only focus on the head, leaving others to move back fixes to stable or older branches. On 09/03/2011 9:07 AM, Donald G Porter wrote: > > On the occasion that we find a bug in the 8.4 branch worth the trouble > of fixing, it's important to follow this merge sequence. > > commit to core-8-4-branch > merge core-8-4-branch to core-8-5-branch and commit > merge core-8-5-branch to trunk and commit. > > The last step is the important one. If you choose to > > merge core-8-4-branch to trunk and commit (BAD BAD BAD do not do!) > > instead, then the dev history has no record that the latest changes of > 8.5 are already in 8.6, and future merge attempts from 8.5 to trunk > don't have a proper foundation to build on. > > Conversely, the transitive nature of "trunk has mods from 8.5 branch > which has mods from 8.4 branch" works just fine to support all future > operations. > |