Hi,<br><br>I have two questions...<br><br>Can a paraview topic branch refer to commits of a vtk topic branch, as long as the paraview topic branch eventually references a vtk master commit? I know it works, but will the hook will reject it?<br>
<br><br>Let's say I merge a paraview topic branch and its HEAD sets the vtk submodule to commit xxxx, a commit in vtk master. Then, after that, someone else merges their paraview topic branch and its HEAD sets the vtk submodule to commit yyyy, where yyyy is a commit in vtk master that is a parent (earlier in history) of xxxx. Will the merge strategy ignore the yyyy reference, and keep the vtk submodule at commit xxxx?<br>
<br><br>Pat<br><br><br><div class="gmail_quote">On Thu, Oct 14, 2010 at 1:50 PM, Marcus D. Hanwell <span dir="ltr"><<a href="mailto:marcus.hanwell@kitware.com">marcus.hanwell@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<div class="im"><br clear="all">Marcus D. Hanwell, Ph.D.<br>R&D Engineer, Kitware Inc.<br>(518) 881-4937<br>
<br><br></div><div class="gmail_quote"><div><div></div><div class="h5">On Thu, Oct 14, 2010 at 10:23 AM, Marcus D. Hanwell <span dir="ltr"><<a href="mailto:marcus.hanwell@kitware.com" target="_blank">marcus.hanwell@kitware.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<div><div>On Tue, Oct 12, 2010 at 4:40 PM, Marcus D. Hanwell <span dir="ltr"><<a href="mailto:marcus.hanwell@kitware.com" target="_blank">marcus.hanwell@kitware.com</a>></span> wrote:</div></div><div class="gmail_quote">
<div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
As previously announced on September 23, the ParaView topic stage is available<br>
to merge in topic branches. From Thursday October 14 all commits to ParaView<br>
will need to be made through the topic stage, and direct pushes to the<br>
ParaView repository will be disabled. Please note that staged topics for Git<br>
submodules must be merged before those in ParaView are merged.<br>
<br></blockquote></div><div><div>As previously announced, direct pushes to ParaView will be disabled today. I have added a new page to the ParaView wiki,<br><br></div><a href="http://www.vtk.org/Wiki/ParaView/Git/Simple" target="_blank">http://www.vtk.org/Wiki/ParaView/Git/Simple</a></div>
<div><br></div><div>This guides you through using some simple utility scripts to set up push URLs, topic stage, useful Git aliases and optionally Gerrit for code review (more details soon). This page is intended to provide a minimal set of instructions to get you up and running. Please feel free to edit the page, or provide feedback here.</div>
</div></blockquote><div><br></div></div></div><div>The switch has been flipped - all commits must now go through the stage. Please let me know if you have any issues that are not covered in the documentation.</div><div class="im">
<div><br></div><div>
Marcus</div><div>--</div><div>Marcus D. Hanwell, Ph.D.</div><div>R&D Engineer, Kitware Inc.</div><div>(518) 881-4937</div></div></div>
<br>_______________________________________________<br>
Paraview-developers mailing list<br>
<a href="mailto:Paraview-developers@paraview.org">Paraview-developers@paraview.org</a><br>
<a href="http://public.kitware.com/mailman/listinfo/paraview-developers" target="_blank">http://public.kitware.com/mailman/listinfo/paraview-developers</a><br>
<br></blockquote></div><br>