On Feb 14, 2007, at 1:18 PM, Mike Woodworth wrote:
i didn't change anything from the default install. my config file
is default - everything is commented out. not sure why i lucked
out. I use bbedit to do the merges. But the diffs on our trac
site are correct.
Ah - you are changing something - you're using BBEdit for processing
the files and diffs. This is similar to what I posted as a
workaround in the original bug report - by loading the files as saved
into vi, changing the EOL and then saving the file back out,
everything then works as it should. Granted, BBEdit is a bit more
intelligent than VI, so there are conversions that BBE handles
automatically.
However, when you say that everything looks right in the trac site
for diffs, do you mean the files are reported, or the actual changed
lines are JUST the lines that really changed?
What I'm shooting for here is to get the EOL default in the REALbasic
VCP files to use LF instead of CR on OS X so that the generic tools
that we all already have on OS X (diff, patch, grep, sed, cvs, svn,
et al) all work with the RB saves natively and without jumping
through lots of configuration and third party hoops.
Tim
mike
On Feb 14, 2007, at 2:59 PM, Tim Jones wrote:
On Feb 14, 2007, at 12:44 PM, Mike Woodworth wrote:
I use the VC format with no problems. We use SVN for our
repository and it works great.
Hi Mike,
Since I've already uncovered that RB's VCP save and SVN out of the
box are not compatible, and since we have no way to change the way
RB saves the VCP files, how have you configured your SVN
installation to get it to properly recognize the Mac CR as the EOL
within the repository? Also, what version of SVN are you running
(server and client)?
I've tried the one recommendation that we received from the svn
list members:
in my .subversion/config file, I added the following lines:
*.rbbas = svn:eol-style=native
*.rbfrm = svn:eol-style=native
*.rbvcp = svn:eol-style=native
After making these changes, the files now display as lines instead
of one long line per file when I examine them in the svn client,
but any attempt to diff the files against the repository result in
the entire file being listed as changed.
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>
_______________________________________________
Unsubscribe or switch delivery mode:
<http://www.realsoftware.com/support/listmanager/>
Search the archives:
<http://support.realsoftware.com/listarchives/lists.html>
_______________________________________________
Unsubscribe or switch delivery mode:
<http://www.realsoftware.com/support/listmanager/>
Search the archives:
<http://support.realsoftware.com/listarchives/lists.html>
