No subject


Fri Mar 19 13:53:46 EDT 2010


First, rewinding head to replay your work on top of it...
Fast-forwarded master to c5f3c079ec12a1a85526a56e40147ded8089b7f0.
kmorel2 0> git status                                /Users/kmorel/src/Para=
View
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working director=
y)
#
#       modified:   VTK
#
no changes added to commit (use "git add" and/or "git commit -a")
kmorel2 1>                                           /Users/kmorel/src/Para=
View

Does anyone have a clue why git is reporting VTK as modified or how to fix =
it?  I first noticed this as I was testing my dashboards and saw that updat=
e was reporting errors.

-Ken

   ****      Kenneth Moreland
    ***      Sandia National Laboratories
***********
*** *** ***  email: kmorel at sandia.gov <http://kmorel@sandia.gov>  <http://k=
morel at sandia.gov>  <http://kmorel@sandia.gov>
**  ***  **  phone: (505) 844-8919
    ***      web:   http://www.cs.unm.edu/~kmorel


_______________________________________________
Paraview-developers mailing list
Paraview-developers at paraview.org <http://Paraview-developers@paraview.org> =
 <http://Paraview-developers@paraview.org>
http://public.kitware.com/mailman/listinfo/paraview-developers





   ****      Kenneth Moreland
    ***      Sandia National Laboratories
***********
*** *** ***  email: kmorel at sandia.gov <http://kmorel@sandia.gov>  <http://k=
morel at sandia.gov>
**  ***  **  phone: (505) 844-8919
    ***      web:   http://www.cs.unm.edu/~kmorel






   ****      Kenneth Moreland
    ***      Sandia National Laboratories
***********
*** *** ***  email: kmorel at sandia.gov <http://kmorel@sandia.gov>
**  ***  **  phone: (505) 844-8919
    ***      web:   http://www.cs.unm.edu/~kmorel





   ****      Kenneth Moreland
    ***      Sandia National Laboratories
***********
*** *** ***  email: kmorel at sandia.gov
**  ***  **  phone: (505) 844-8919
    ***      web:   http://www.cs.unm.edu/~kmorel


--_000_C7F6195314DD1kmorelsandiagov_
Content-Type: text/html;
 charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

<HTML>
<HEAD>
<TITLE>Re: [Paraview-developers] New git repo: reporting changed repo after=
 only pull</TITLE>
</HEAD>
<BODY>
<FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"><SPAN STYLE=3D'font-size:=
11pt'>How will that work? &nbsp;If I put it before ctest_update, then it wi=
ll run before the VTK submodule SHA gets updated. &nbsp;Thus, it my not gra=
b the commit that you actually need. &nbsp;Or does the submodule update com=
mand implicitly fetch everything from the remote regardless of whether it i=
s needed?<BR>
<BR>
-Ken<BR>
<BR>
<BR>
On 4/22/10 3:02 PM, &quot;Dave Partyka&quot; &lt;<a href=3D"dave.partyka at ki=
tware.com">dave.partyka at kitware.com</a>&gt; wrote:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>You want to put it before ctest_update is c=
alled.<BR>
<BR>
On Thu, Apr 22, 2010 at 3:40 PM, Moreland, Kenneth &lt;<a href=3D"kmorel at sa=
ndia.gov">kmorel at sandia.gov</a>&gt; wrote:<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>I tried adding your execute_process after m=
y call to ctest_update, but I don&#8217;t think it&#8217;s quite working. =
=A0The problem is that the submodule update command does not get run until =
after the ctest_update call returns, and by that time CTest has already det=
ermined that the update has failed.<BR>
<BR>
Where exactly should I be putting the execute_process?<BR>
<BR>
-Ken<BR>
<BR>
<BR>
<BR>
On 4/20/10 7:07 AM, &quot;Dave Partyka&quot; &lt;<a href=3D"dave.partyka at ki=
tware.com">dave.partyka at kitware.com</a> &lt;<a href=3D"http://dave.partyka@=
kitware.com">http://dave.partyka@kitware.com</a>&gt; &gt; wrote:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>You're going to want to add something like =
this in your script for initial checkout:<BR>
<BR>
=A0=A0execute_process(<BR>
=A0=A0 =A0COMMAND \&quot;${CTEST_GIT_COMMAND}\&quot; submodule init<BR>
=A0=A0 =A0WORKING_DIRECTORY \&quot;${CTEST_SOURCE_DIRECTORY}\&quot;<BR>
=A0=A0 =A0)<BR>
<BR>
And for each update you'll want:<BR>
<BR>
=A0=A0execute_process(<BR>
=A0=A0 =A0COMMAND \&quot;${CTEST_GIT_COMMAND}\&quot; submodule update --rec=
ursive --<BR>
=A0=A0 =A0WORKING_DIRECTORY \&quot;${CTEST_SOURCE_DIRECTORY}\&quot;<BR>
=A0=A0 =A0)<BR>
<BR>
Also this will be handy:<BR>
<BR>
# Look for a GIT command-line client.<BR>
if(NOT DEFINED CTEST_GIT_COMMAND)<BR>
find_program(CTEST_GIT_COMMAND NAMES git git.cmd)<BR>
endif()<BR>
<BR>
On Mon, Apr 19, 2010 at 7:16 PM, Dave Partyka &lt;<a href=3D"dave.partyka at k=
itware.com">dave.partyka at kitware.com</a> &lt;<a href=3D"http://dave.partyka=
@kitware.com">http://dave.partyka@kitware.com</a>&gt; &gt; wrote:<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>I do not know if ctest knows how to update =
submodules automatically. I have it on my todo list to talk to Brad King ab=
out this for the same reason for updating the ParaView dashboards here at K=
itware. I'll share what I find out.<BR>
<BR>
<BR>
On Mon, Apr 19, 2010 at 7:13 PM, Moreland, Kenneth &lt;<a href=3D"kmorel at sa=
ndia.gov">kmorel at sandia.gov</a> &lt;<a href=3D"http://kmorel@sandia.gov">ht=
tp://kmorel@sandia.gov</a>&gt; &gt; wrote:<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>Yes. =A0That seems to fix the problem. =A0H=
owever, is there a way to get ctest to run that after pulling? =A0Otherwise=
 we&#8217;ll still get a bunch of errors in the dashboard.<BR>
<BR>
-Ken<BR>
<BR>
<BR>
<BR>
On 4/19/10 5:09 PM, &quot;Dave Partyka&quot; &lt;<a href=3D"dave.partyka at ki=
tware.com">dave.partyka at kitware.com</a> &lt;<a href=3D"http://dave.partyka@=
kitware.com">http://dave.partyka@kitware.com</a>&gt; &nbsp;&lt;<a href=3D"h=
ttp://dave.partyka@kitware.com">http://dave.partyka@kitware.com</a>&gt; &gt=
; wrote:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>does 'git submodule update' help?<BR>
<BR>
On Mon, Apr 19, 2010 at 7:02 PM, Moreland, Kenneth &lt;<a href=3D"kmorel at sa=
ndia.gov">kmorel at sandia.gov</a> &lt;<a href=3D"http://kmorel@sandia.gov">ht=
tp://kmorel@sandia.gov</a>&gt; &nbsp;&lt;<a href=3D"http://kmorel@sandia.go=
v">http://kmorel@sandia.gov</a>&gt; &gt; wrote:<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE=3D"Calibri, Verdana, Helvetica, Arial"=
><SPAN STYLE=3D'font-size:11pt'>I noticed something odd when converting to =
the new git repositories today. =A0After only cloning the repository, setti=
ng up the modules, and then pulling (using the --rebase flag as described o=
n the Wiki), status reports that I have made a change in my repository even=
 though I have not. =A0Here is a terminal capture of a newly cloned ParaVie=
w repository (after modules and hooks are set up).<BR>
<BR>
</SPAN></FONT></BLOCKQUOTE></BLOCKQUOTE></BLOCKQUOTE></BLOCKQUOTE></BLOCKQU=
OTE></BLOCKQUOTE></BLOCKQUOTE><FONT SIZE=3D"2"><FONT FACE=3D"Consolas, Cour=
ier New, Courier"><SPAN STYLE=3D'font-size:10pt'>kmorel2 0&gt; git status =
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0/Users/kmorel/src/ParaView<BR>
# On branch master<BR>
nothing to commit (working directory clean)<BR>
kmorel2 1&gt; git pull --rebase =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0/Users/kmorel/src/ParaView<BR>
remote: Counting objects: 44, done.<BR>
remote: Compressing objects: 100% (26/26), done.<BR>
remote: Total 26 (delta 20), reused 0 (delta 0)<BR>
Unpacking objects: 100% (26/26), done.<BR>


More information about the Paraview-developers mailing list