[vtk-developers] 5.8 merge request

[Marcus D. Hanwell]

On Mon, Jul 11, 2011 at 3:10 PM, Clinton Stimpson <clinton at elemtech.com> wrote:
>
> How do merge requests for VTK 5.8 work?  I have a handful of bug fix commits
> I'd like to see merged into the release branch.
>
> I'm not sure if its the right approach, but I've got a topic branch based on
> the release branch with the commits cherry picked.  I'm not sure what is next,
> and I don't see anything on the wiki about this.

In the ideal case, if you are preparing patches destined for the
release branch, your original topic would be based on release, merged
into master, tested and when ready we can simply merge the branch into
release. That way only the merge commits differ, and it is clear they
are the same patches.

Second best is what you have done, if you push the branch to the stage
I think Dave Partyka is the only one who can merge. He can then get
the topic from the stage, test it out and push if everything looks OK.

Marcus