CFD Online Discussion Forums

CFD Online Discussion Forums (http://www.cfd-online.com/Forums/)
-   OpenFOAM Bugs (http://www.cfd-online.com/Forums/openfoam-bugs/)
-   -   Irritating TYPO in updateFromRepositoryAndCompilesh trashes source (http://www.cfd-online.com/Forums/openfoam-bugs/62482-irritating-typo-updatefromrepositoryandcompilesh-trashes-source.html)

vonbraun April 29, 2008 22:07

Description: Ugh. Copies of u
 
Description:
Ugh. Copies of updateFromRepositoryAndCompile.sh
in both /branches/OpenCFD_Release/OpenFOAM-1.4.1_patch and /branches/OpenCFD_Release/OpenFOAM-1.4_patch have a typo that will ensure your local working copy is useless and WON'T compile:

Reads (in the case of OpenFOAM-1.4.1_patch) on line 5:

svn diff -r30 --diff-cmd diff -x "--unified=7".........

"-r30"?????!!! The file this is in isn't even revision 30. Some untouched files are still Rev 30, but all useful patches are in the triple digits.

Solver/Application:
Since we're after the latest patches submitted to this repo. section, why not use HEAD?

Therefore PATCH LINE 5 of updateFromRepositoryAndCompile.sh
in BOTH OpenFOAM-1.4_patch and OpenFOAM-1.4.1_patch to read:

svn diff -r HEAD --diff-cmd diff -x "--unified=7" https://openfoam-extend......etcetc

Versions:
Affects SVN patch branches:
/branches/OpenCFD_Release/OpenFOAM-1.4.1_patch
/branches/OpenCFD_Release/OpenFOAM-1.4_patch

Notes:
This lil' critter-beast pre-vented a shucsheshful compilatorium on thayt there computah-gizmo-whatzit. Supposin' now I can bes checkin' this 'ere software out somethun speshul-like...

vonbraun April 29, 2008 22:34

Whoops! Made a boo-boo myself:
 
Whoops! Made a boo-boo myself:

Use:
svn diff -r HEAD:30 --diff-cmd diff -x "--unified=7" https://openfoam-exten....
for 1.4.1_patch and

svn diff -r HEAD:6 --diff-cmd diff -x "--unified=7" https://openfoam-exten....
for 1.4_patch

Sorry, my bad. Think I've got it right now... trying to patch now.. if it doesn't work I'll get the full SVN, but I'll post here to let y'all know how I went...

vonbraun April 30, 2008 01:05

Looks like I got it back-the-f
 
Looks like I got it back-the-front. Using HEAD:30 just ensured I was at Revision 30. svn log -r HEAD:30 outputs change logs from newest to oldest, whilst 30:HEAD outputs change logs from oldest to newest...

So now I'm trying:
svn diff -r 30:HEAD --diff-cmd diff -x "--unified=7" https://openfoam-exten.....

I'll let you know how I fared...

vonbraun April 30, 2008 03:23

Yep, that seems to have done t
 
Yep, that seems to have done the trick.
SO: svn diff -r 30 --diff-cmd.......
doesn't update to the latest revision.

in updateFromRepositoryAndCompile.sh :
for 1.4.1_patch:
change: svn diff -r 30 --diff-cmd...
to: svn diff -r 30:HEAD --diff-cmd....

and for 1.4_patch:
change: svn diff -r 6 --diff-cmd...
to: svn diff -r 6:HEAD --diff-cmd...

This essentially says "collect all differences between revision 6 and the HEAD revision, and calculate the diff strings relative to my local source, for the intent of upgrading towards HEAD revision".

Sorry about the mix-up earlier, but now I'm happy and compiling away with the latest HEAD of the bugfix patches.

gschaider April 30, 2008 07:40

Hi! I was under the impress
 
Hi!

I was under the impression that -r 30 implies -r 30:HEAD (at least it works for me). Maybe this is an issue with different versions of the svn-client. I will change this in the svn(as soon as the sourceforge.net comes back online - currently I can't reach it)

Bernhard


All times are GMT -4. The time now is 12:15.