[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Slight problem with conflict resolution

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-07-19 02:45:53 CEST

I am testing merge and the interactive callback. This passes four
files that can be used by a graphical merge program. Technically one
of the files in this scenario is just to hold the output. I am
running into what I see as a problem with line endings in these files.
 I talked to Ben on IRC today and he gave me a quick answer but was
not feeling well and had to leave. He had me update the docstrings to
say that the four files are in "Repository-normal" form, meaning they
have LF line endings and contracted keywords (if those features are
being used).

It turns out this is not correct. The "mine file" is of course just
the file in your WC. The problem is suppose you are on Windows. The
base and theirs file will have LF line endings and the mine file will
have CRLF line endings.

OK, most GUI programs can ignore these. The problem is the ones that
I use will tend to copy the line endings when you tell it to copy a
block of code from the theirs file. Now you have a file with mixed
line endings.

We obviously cannot change the "mine file" so I think we need to
change the other two files so that line endings and keywords have been

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 19 02:45:05 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.