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

Re: [PATCH] Issue #1325: use files' eol markers for conflict markers

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-12-06 21:06:23 CET

Peter N. Lundblad wrote:
>
> Make our internal merge code use the 'modified' file for conflict markers.

Mention "EOL style", and mention the issue:

"Make our internal merge code use the EOL style of the 'modified' file for
conflict markers, instead of the platform default EOL style. Fixes issue
#1325: 'update conflict markers ignore file's eol style'."

> This often gives consinstent line endings even when svn:eol-style is not
> set on a file.

"consistent" (sp.)

The patch looks good. Minor nit: diff_file.c seems not to use spaces before
parentheses, but your added lines do.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 6 21:10:06 2005

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