[Paraview-developers] CVS->Git Transition Plan

[pat marion]

Hi John,

The following commands show you how to move work between two local
repositories.  Maybe Brad will tell you a better way, this is how I make it
work:


<clone paraview from paraview.org>
cd ParaView
git submodule init
git submodule update

<now we're up to date with a perfectly clean paraview>

cd VTK
git checkout -b mywork
<edit edit>
git commit -a -m "adding new work to VTK"

<now we'll clone a second paraview repo and grab our vtk changes>

git clone /mywork/paraview/ParaView ParaViewNew
cd ParaViewNew
git submodule init
git submodule update  # <--- downloads vtk from kitware
cd VTK
git remote add myvtk /mywork/paraview/ParaView/VTK
git fetch myvtk

Now the repo ParaViewNew/VTK knows about all the commits in ParaView/VTK.
You won't get that error message anymore.  To checkout the work in the new
vtk repo:

git checkout -b mywork myvtk/mywork


Pat


On Fri, Apr 23, 2010 at 3:08 AM, Biddiscombe, John A. <biddisco at cscs.ch>wrote:

> So as predicted, everything is totally screwed up.
>
> I have cloned paraview, got the submodules,
> created a branch cscs-pv on the main paraview clone
> created a branch cscs-pv on the Utilities/Xdmf sub dir
> created a branch cscs-pv on the VTK sub dir
>
> locally, I have commited all my changes to main/xdmf/vtk directories, and I
> was even savvy enough (I thought) to add my VTK and Xdmf changed branch
> stuff to the main commit.
>
> And although my local tree shows everything 'up to date' - I cannot
> actually push the VTK/Xdmf stuff to my published cloned repo - it is
> essentially useless.
>
> a checkout from the published repo gives me the main paraview stuff as
> expected, but I cannot get the updated submodules. In fact they are now
> completely broken and do nothing at all
> if I try to checkout/update from the published repo
>
> git submodule update returns ....
> fatal: reference is not a tree: 8eb59f23eb8e69d94cbd7eb6ad029acd5d676f25
> Unable to checkout '8eb59f23eb8e69d94cbd7eb6ad029acd5d676f25' in submodule
> path 'Utilities/Xdmf2'
>
> it refuses to give me anything.
>
> I now have at least 4 clones of clones, and I do not know what to do (or
> which is master anymore). I followed instructions from wikis and though I
> did everything right. Please help!!!!
>
> Here's my best guess. Wipe everything, start again.
> Clone Xdmf : create a cscs-pv branch. publish this on my temporary internal
> server
> Clone VTK  : create a cscs-pv branch. publish this on my temporary internal
> server
> Clone paraview : create a cscs-pv branch - somehow tell the repo to not use
> the submodules from kitware, but instead use my locally published ones, then
> things might work.
>
> Am I anywhere near close to getting it working?
>
> Any help greatly appreciated.
>
> JB
> _______________________________________________
> 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/20100423/f61a1974/attachment.htm>