[Paraview-developers] ANN: All ParaView commits through the topic stage

[pat marion]

Hi,

I have two questions...

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?


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?


Pat


On Thu, Oct 14, 2010 at 1:50 PM, Marcus D. Hanwell <
marcus.hanwell at kitware.com> wrote:

>
> Marcus D. Hanwell, Ph.D.
> R&D Engineer, Kitware Inc.
> (518) 881-4937
>
>
> On Thu, Oct 14, 2010 at 10:23 AM, Marcus D. Hanwell <
> marcus.hanwell at kitware.com> wrote:
>
>> On Tue, Oct 12, 2010 at 4:40 PM, Marcus D. Hanwell <
>> marcus.hanwell at kitware.com> wrote:
>>
>>> As previously announced on September 23, the ParaView topic stage is
>>> available
>>> to merge in topic branches. From Thursday October 14 all commits to
>>> ParaView
>>> will need to be made through the topic stage, and direct pushes to the
>>> ParaView repository will be disabled. Please note that staged topics for
>>> Git
>>> submodules must be merged before those in ParaView are merged.
>>>
>>> As previously announced, direct pushes to ParaView will be disabled
>> today. I have added a new page to the ParaView wiki,
>>
>> http://www.vtk.org/Wiki/ParaView/Git/Simple
>>
>> 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.
>>
>
> 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.
>
> Marcus
> --
> Marcus D. Hanwell, Ph.D.
> R&D Engineer, Kitware Inc.
> (518) 881-4937
>
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20101014/73f57600/attachment.htm>