[vtk-developers] Strange repo happenings with vtkOpenGLProjectedTetrahedraMapper
Marcus D. Hanwell
marcus.hanwell at kitware.com
Thu Dec 22 10:53:53 EST 2011
On Thu, Dec 22, 2011 at 10:37 AM, David Cole <david.cole at kitware.com> wrote:
> Bill,
>
> Are you saying that commits of yours that were in master are no longer
> in master?
>
> Or is something missing in gerrit?
>
Dave,
I can see what Bill means, if you look at commit 484a24c you can see
that vtkOpenGLProjectedTetrahedraMapper had the vtkstd stuff removed,
and that commit was merged. If you look at the commits that touched
the file,
git log -p VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.cxx
You cannot see that commit applied to the file anymore. I am guessing
it got clobbered when a conflict was resolved by Utkarsh.
Marcus
More information about the vtk-developers
mailing list