Hi John,<br><br>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:<br><br><br><clone paraview from <a href="http://paraview.org">paraview.org</a>><br>
cd ParaView<br>git submodule init<br>git submodule update<br><br><now we're up to date with a perfectly clean paraview><br><br>cd VTK<br>git checkout -b mywork<br><edit edit><br>git commit -a -m "adding new work to VTK"<br>
<br><now we'll clone a second paraview repo and grab our vtk changes><br><br>git clone /mywork/paraview/ParaView ParaViewNew<br>cd ParaViewNew<br>git submodule init<br>git submodule update # <--- downloads vtk from kitware<br>
cd VTK<br>git remote add myvtk /mywork/paraview/ParaView/VTK<br>git fetch myvtk<br><br>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:<br>
<br>git checkout -b mywork myvtk/mywork<br><br><br>Pat<br><br><br><div class="gmail_quote">On Fri, Apr 23, 2010 at 3:08 AM, Biddiscombe, John A. <span dir="ltr"><<a href="mailto:biddisco@cscs.ch">biddisco@cscs.ch</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">So as predicted, everything is totally screwed up.<br>
<br>
I have cloned paraview, got the submodules,<br>
created a branch cscs-pv on the main paraview clone<br>
created a branch cscs-pv on the Utilities/Xdmf sub dir<br>
created a branch cscs-pv on the VTK sub dir<br>
<br>
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.<br>
<br>
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.<br>
<br>
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<br>
if I try to checkout/update from the published repo<br>
<br>
git submodule update returns ....<br>
fatal: reference is not a tree: 8eb59f23eb8e69d94cbd7eb6ad029acd5d676f25<br>
Unable to checkout '8eb59f23eb8e69d94cbd7eb6ad029acd5d676f25' in submodule path 'Utilities/Xdmf2'<br>
<br>
it refuses to give me anything.<br>
<br>
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!!!!<br>
<br>
Here's my best guess. Wipe everything, start again.<br>
Clone Xdmf : create a cscs-pv branch. publish this on my temporary internal server<br>
Clone VTK : create a cscs-pv branch. publish this on my temporary internal server<br>
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.<br>
<br>
Am I anywhere near close to getting it working?<br>
<br>
Any help greatly appreciated.<br>
<br>
JB<br>
<div><div></div><div class="h5">_______________________________________________<br>
Paraview-developers mailing list<br>
<a href="mailto:Paraview-developers@paraview.org">Paraview-developers@paraview.org</a><br>
<a href="http://public.kitware.com/mailman/listinfo/paraview-developers" target="_blank">http://public.kitware.com/mailman/listinfo/paraview-developers</a><br>
</div></div></blockquote></div><br>