<div class="gmail_quote">On Thu, Oct 14, 2010 at 3:20 PM, pat marion <span dir="ltr"><<a href="mailto:pat.marion@kitware.com">pat.marion@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
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></blockquote><div>Yes, the hook will reject it as all submodule commits must refer to a reachable VTK. I worked on this with Utkarsh yesterday, and would like to discuss the issues we hit with Brad once he is back in the office. </div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><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>
</blockquote><div><br></div><div>Yes, we upgraded the Git on the stage so that it has much improved submodule conflict resolution. So long as one submodule hash is a fast-forward of the other, the most recent submodule hash of the two will be retained. This is why we want to restrict the submodule hashes, so that automatic conflict resolution like this will work.</div>
<div><br></div><div>Marcus</div></div>