[vtk-developers] Strange repo happenings with vtkOpenGLProjectedTetrahedraMapper

David Cole david.cole at kitware.com
Thu Dec 22 10:37:00 EST 2011


Bill,

Are you saying that commits of yours that were in master are no longer
in master?

Or is something missing in gerrit?



On Thu, Dec 22, 2011 at 10:13 AM, Utkarsh Ayachit
<utkarsh.ayachit at kitware.com> wrote:
> Bill,
>
> I may have accidentally resolved the conflict I was having with
> vtk-master  and pv-master by undoing your changes. But I'm still
> confused as to how that would change the history for that file.
>
> Utkarsh
>
> On Thu, Dec 22, 2011 at 10:05 AM, Marcus D. Hanwell
> <marcus.hanwell at kitware.com> wrote:
>> On Thu, Dec 22, 2011 at 8:42 AM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>>> Marcus,
>>>
>>> The changes that I made to the subject class in November and your
>>> changes to remove vtkstd in the same class seemed to have disappeared
>>> on Monday. Utkarsh remade your chanhes on Tuesday. I noticed that my
>>> changes to fix a memory leak are not present.
>>>
>>> If I do a git log on the vtkOpenGLProjectedTetrahedraMappe.cxx file I
>>> don't see your commits or mine.
>>>
>>> This strangeness started on Monday, the day we switched over to the
>>> new gerrit version.
>>>
>> Hi Bill,
>>
>> I don't think this is related to Gerrit, as it can only receive
>> updates to the git repository (it does not create or edit any commits
>> at present and is fed new commits by a robot that pushes its master
>> forward). I will see what might be happening with Brad/Utkarsh as I
>> know they had to do something to ParaView's VTK branches.
>>
>> Marcus
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>
> Follow this link to subscribe/unsubscribe:
> http://www.vtk.org/mailman/listinfo/vtk-developers
>



More information about the vtk-developers mailing list