On 9 Nov 2014, at 18:45, Erik Schnetter <[email protected]> wrote:

> I see that the ET build server is failing for the past two commits. I
> can only access the commit messages on the build server's web pages,
> and they point to unrelated Simfactory MDB changes. Is there a way to
> get a complete diff between the last succeeding and the first failing
> version?

Hi Erik,

The build system shows you the commit message recorded in the super-repository 
for each change, including the commits in the submodules.  If everything is 
working well, this is usually enough to tell what is wrong.  If you want to be 
more certain, and not rely on the commit messages in the super-repo or 
submodules being accurate, you can check the exact differences as follows.

First check out the git super-repository containing the Einstein Toolkit:

        git clone --recursive 
https://bitbucket.org/einsteintoolkit/einsteintoolkit.git

Next identify the two commits that you want to compare.  You can get these from 
Jenkins by clicking on the build and reading what it says next to "Revision".  
In this case, the commits are 63280a1829c497e99fc45e6e5e3c929b605a52ca and 
cf35c92b2c588220e3902817e43a76d33bcd412e.

You can get the changes in the super-repository with

        git diff 
63280a1829c497e99fc45e6e5e3c929b605a52ca..cf35c92b2c588220e3902817e43a76d33bcd412e

This does not recurse into the submodules and show their diffs, it just reports 
the change to the version of the submodule.  It would be nice if there was a 
built-in way to do this easily in Git, but there isn't.  Instead, you can use 
this

        while read a submodule range; do (echo "Submodule $submodule"; cd 
$submodule; git diff ${range%*:}); done < <(git diff --submodule 
63280a1829c497e99fc45e6e5e3c929b605a52ca..cf35c92b2c588220e3902817e43a76d33bcd412e|grep
 '^Submodule')

This will give you the complete diffs of all submodule changes between the two 
super-repository commits.

-- 
Ian Hinder
http://numrel.aei.mpg.de/people/hinder

_______________________________________________
Users mailing list
[email protected]
http://lists.einsteintoolkit.org/mailman/listinfo/users

Reply via email to