[kepler-dev] Control-ms in files: Before adding files, make sure that your svn is configured

Christopher Brooks cxh at eecs.berkeley.edu
Mon Sep 21 15:06:46 PDT 2009


By default, when a file is added using Subversion, it is added
in binary mode.  If you properly configure your Subversion installation,
then you can control how files are added and add them with native
line endings.

See http://chess.eecs.berkeley.edu/ptexternal/wiki/Main/Subversion#KeywordSubstitution
for details on how to properly configure Subversion.

In Ptolemy, we set two svn:keywords and svn:eol-style.

To check, use these commands:

bash-3.2$ svn proplist README.txt
Properties on 'README.txt':
   svn:keywords
   svn:eol-style
bash-3.2$ svn propget svn:keywords README.txt
Author Date Id Revision
bash-3.2$ svn propget svn:eol-style README.txt
native

The reason this is important is because in the default Subversion configuratoin,
if a file is added from Windows and checked out using Mac OS X or Linux,
then the file will have control-m characters in it, which make running scripts
on the file difficult.

To determine which Kepler files have control-ms, I did:
cd ~/src/kepler
find . -name "*.java" > /tmp/kj
cat /tmp/kj | xargs ~/ptII/util/testsuite/controlm  >& /tmp/kcm

To determine who checked these in, I did:
$PTII/adm/bin/svnAuthor `cat /tmp/kcm | awk '{print $1}'`

The output is below:

madhu ./actors/src/org/camera/service/AverageGenomeSizeParserV2.java r16395 | madhu | 2009-01-20 15:59:31 -0800 (Tue, 20 Jan 2009)
madhu ./actors/src/org/camera/service/CAMERARESTService.java r16395 | madhu | 2009-01-20 15:59:31 -0800 (Tue, 20 Jan 2009)
madhu ./actors/src/org/camera/service/CAMERAURLProcessor.java r16614 | madhu | 2009-02-11 11:35:11 -0800 (Wed, 11 Feb 2009)
madhu ./actors/src/org/camera/service/IdSizeMapForSeqFile.java r16395 | madhu | 2009-01-20 15:59:31 -0800 (Tue, 20 Jan 2009)
madhu ./actors/src/org/camera/service/NameValuePair.java r16395 | madhu | 2009-01-20 15:59:31 -0800 (Tue, 20 Jan 2009)
madhu ./actors/src/org/camera/service/ServiceUtils.java r16395 | madhu | 2009-01-20 15:59:31 -0800 (Tue, 20 Jan 2009)
chandrika ./actors/src/org/kepler/actor/job/GenericJobLauncher.java r20169 | chandrika | 2009-08-04 10:51:28 -0700 (Tue, 04 Aug 2009)
jianwu ./actors/src/org/kepler/actor/job/JobFileFetcher.java r18013 | jianwu | 2009-05-12 16:08:58 -0700 (Tue, 12 May 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/BbcpCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/FileCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/FileCopierFactory.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/GenericFileCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/LocalFileCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/ScpCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/SftpCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/SrmliteCopier.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/src/org/sdm/spa/actors/transport/vo/ConnectionDetails.java r16852 | chandrika | 2009-03-04 19:53:53 -0800 (Wed, 04 Mar 2009)
jianwu ./actors/src/org/srb/DataGridTransfer.java r18626 | jianwu | 2009-05-27 16:44:31 -0700 (Wed, 27 May 2009)
chandrika ./actors/tests/src/org/sdm/spa/actors/transport/GenericFileCopierTest.java r16853 | chandrika | 2009-03-04 19:55:35 -0800 (Wed, 04 Mar 2009)
chandrika ./actors/tests/src/org/sdm/spa/actors/transport/RunGenericFileCopierTests.java r16853 | chandrika | 2009-03-04 19:55:35 -0800 (Wed, 04 Mar 2009)
aschultz ./component-library/src/org/kepler/objectmanager/library/SemanticTypeIndex.java r20151 | aschultz | 2009-07-31 12:14:28 -0700 (Fri, 31 Jul 2009)
aschultz ./core/src/org/kepler/kar/KARCacheManager.java r19511 | aschultz | 2009-06-24 19:00:40 -0700 (Wed, 24 Jun 2009)
aschultz ./core/src/org/kepler/kar/SaveKAR.java r19913 | aschultz | 2009-07-09 15:31:59 -0700 (Thu, 09 Jul 2009)
aschultz ./core/src/org/kepler/moml/FolderEntityLibrary.java r19579 | aschultz | 2009-06-26 15:44:45 -0700 (Fri, 26 Jun 2009)
aschultz ./core/src/org/kepler/moml/KAREntityLibrary.java r19579 | aschultz | 2009-06-26 15:44:45 -0700 (Fri, 26 Jun 2009)
aschultz ./core/src/org/kepler/moml/OntologyEntityLibrary.java r19579 | aschultz | 2009-06-26 15:44:45 -0700 (Fri, 26 Jun 2009)
aschultz ./core/src/org/kepler/sms/NamedOntClass.java r17479 | aschultz | 2009-04-07 15:03:22 -0700 (Tue, 07 Apr 2009)
aschultz ./core/src/org/kepler/sms/NamedOntModel.java r17479 | aschultz | 2009-04-07 15:03:22 -0700 (Tue, 07 Apr 2009)
aschultz ./core/src/org/kepler/sms/NamedOntProperty.java r17479 | aschultz | 2009-04-07 15:03:22 -0700 (Tue, 07 Apr 2009)
aschultz ./core/src/org/kepler/sms/OntologyCatalog.java r17479 | aschultz | 2009-04-07 15:03:22 -0700 (Tue, 07 Apr 2009)
aschultz ./core/src/org/kepler/util/DotKeplerManager.java r18914 | aschultz | 2009-06-01 20:55:01 -0700 (Mon, 01 Jun 2009)
aschultz ./gui/src/org/kepler/gui/component/OpenCompositeAction.java r20504 | aschultz | 2009-09-01 14:20:31 -0700 (Tue, 01 Sep 2009)
aschultz ./gui/src/org/kepler/gui/component/ShowFolders.java r19887 | aschultz | 2009-07-08 17:33:11 -0700 (Wed, 08 Jul 2009)
aschultz ./gui/src/org/kepler/gui/kar/ActorUploaderAction.java r19913 | aschultz | 2009-07-09 15:31:59 -0700 (Thu, 09 Jul 2009)
aschultz ./gui/src/org/kepler/gui/kar/ComponentUploader.java r19866 | aschultz | 2009-07-07 17:56:57 -0700 (Tue, 07 Jul 2009)
aschultz ./gui/src/org/kepler/gui/kar/DeleteArchiveAction.java r20511 | aschultz | 2009-09-01 16:43:17 -0700 (Tue, 01 Sep 2009)
aschultz ./gui/src/org/kepler/gui/kar/ExportArchiveAction.java r19866 | aschultz | 2009-07-07 17:56:57 -0700 (Tue, 07 Jul 2009)
aschultz ./gui/src/org/kepler/gui/lsid/LSIDViewer.java r18623 | aschultz | 2009-05-27 16:27:33 -0700 (Wed, 27 May 2009)
aschultz ./gui/src/org/kepler/gui/lsid/LSIDViewerAction.java r18623 | aschultz | 2009-05-27 16:27:33 -0700 (Wed, 27 May 2009)
aschultz ./gui/src/org/kepler/gui/popups/FolderPopup.java r20192 | aschultz | 2009-08-05 15:38:21 -0700 (Wed, 05 Aug 2009)
aschultz ./gui/src/org/kepler/gui/popups/KARFolderPopup.java r20192 | aschultz | 2009-08-05 15:38:21 -0700 (Wed, 05 Aug 2009)
aschultz ./gui/src/org/kepler/gui/popups/OntologyPopup.java r20192 | aschultz | 2009-08-05 15:38:21 -0700 (Wed, 05 Aug 2009)
aschultz ./repository/src/org/kepler/kar/UploadToRepository.java r19872 | aschultz | 2009-07-07 22:29:45 -0700 (Tue, 07 Jul 2009)
chandrika ./ssh/src/org/kepler/ssh/SftpExec.java r16851 | chandrika | 2009-03-04 19:47:34 -0800 (Wed, 04 Mar 2009)


This is not a big deal, just fyi if you are running scripts under non-Windows
and have problems.

I fixed the above issues by setting the svn:keywords and svn:eol-style properties.

_Christopher

-- 
Christopher Brooks (cxh at eecs berkeley edu) University of California
CHESS Executive Director                      US Mail: 337 Cory Hall
Programmer/Analyst CHESS/Ptolemy/Trust        Berkeley, CA 94720-1774
ph: 510.643.9841 fax:510.642.2718	      (Office: 545Q Cory)
home: (F-Tu) 707.665.0131 (W-F) 510.655.5480


More information about the Kepler-dev mailing list