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

File properties in svn merge

From: Jeenu V <jeenuv_at_gmail.com>
Date: Tue, 23 Sep 2008 20:36:27 +0530


I would like get some info on SVN merging.

I've two paths: A and B. And B is a copy of A (branched from A). After
they're are branched out, I separately set SVN property 'svn:eol-style' to
LF (after converting them to unix format) for all of the files in both the
branches. Now, when I merge the changes of branch A to B, SVN is showing a
'G' in the second column, which I understand that the file properties are
merged. More over, I'm getting conflicts for files that are unchanged,
unless I specify --ignore-eol-style in the merge command.

Can somebody tell me what's going wrong?

Received on 2008-09-23 18:28:34 CEST

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

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