On Feb 12, 2007, at 3:53 PM, [EMAIL PROTECTED] wrote:
On Feb 12, 2007, at 22:36 UTC, Tim Jones wrote:
So is everyone now seeing what I'm seeing? I seem to recall a few of
you who claimed success with the default Mac OEOL and SVN. I really
would love to have details of how you achieved the success.
I haven't tried it yet with the new version control format, but I have
successfully used the XML format with svn for a long time.
TheXML version is tough to parse with large projects because the
ENTIRE project is one large file. But, it does use LF as the EOL
instead of CR.
Recentversions of RB use Unix line endings on OS X, but older ones
used Mac
line endings. Svn worked fine with them too -- you can configure
subversion to do line-ending translations as needed.
I've already done that and I do get the proper line breaks displayed,
but the issue is on the server side when the a diff mode call is
made. The result is that the entire file has changed. To repeat my
previous email:
I've gone back over the emails in the NUG where some of you have
indicated that the use of the Mac EOL in the RB VCP format is not
a problem. However, in using either SVN or CVS here, my results
indicate quite otherwise. When I import the Mac EOL project into
either, the import is successful (however, SVN does do a better
job with the binary bits). After the import, I checkout the
imported version, open it within 2007r1 and make one change - in
the Main Window class, I change the Caption of one pushbutton. I
save this out.
Next, I go into a Terminal and CD into the checked out project
root and issue:
svn status
or
cvs status | grep Status | grep -v Up-to
The result recognizes that three files are locally modified - the
Main Window, CarbonDeclares, and App. However, as mentioned
above, only the Main Window (WMain) was changed. And, since both
SVN and CVS are recognizing that these three files were changed,
the IDE MUST be changing them in some manner when the changes are
saved.
Additionally, as I've indicated previously and then been argued
against, the use of "svn diff WMain.rbfrm" displays the ENTIRE
WMain.rbfrm as changed because of the use of the Mac EOL when the
project is saved and SVN is expecting Unix EOL's.
The only problem was when some users of the same project were on
Windows, and some were on the Mac. Then it reported the whole file
had
changed, as you say. If I recall correctly, the XML exporter was
changed so that it always writes out with the same line ending it had
when reading the file in, and the XML importer was updated to not care
which line ending was used. That solved the problem.
It sounds like maybe the version control format needs the same
treatment.
Correct.
Incidentally, on Mac OS X, I hope that it's using Unix line endings
rather than old Mac line endings. We're likely to be working with
these files with Unix tools besides svn, and most other Unix tools
aren't as forgiving about line endings. This is why the XML export on
OS X uses Unix line endings by default (but preserves whatever was
there before if it's updating an existing file). The same behavior
would be good for the version-control format, too.
That's exactly the problem - it's not. The VCP files are all written
out with the Mac CR EOL. That's what the feature request was for:
http://www.realsoftware.com/feedback/viewreport.php?reportid=ppxkfpqm
Tim
--
Tim Jones
[EMAIL PROTECTED]
_______________________________________________
Unsubscribe or switch delivery mode:
<http://www.realsoftware.com/support/listmanager/>
Search the archives:
<http://support.realsoftware.com/listarchives/lists.html>
