RE: Merge Conflict on Windows with eol-style & mergeinfo properties

2011-02-24 Thread Varnau, Steve (Neoview)
> -Original Message- > From: Johan Corveleyn [mailto:jcor...@gmail.com] > Sent: Thursday, February 24, 2011 1:47 AM > To: Varnau, Steve (Neoview) > Cc: users@subversion.apache.org > Subject: Re: Merge Conflict on Windows with eol-style & mergeinfo > properties

Re: Merge Conflict on Windows with eol-style & mergeinfo properties

2011-02-24 Thread Johan Corveleyn
On Thu, Feb 24, 2011 at 12:56 AM, Varnau, Steve (Neoview) wrote: > Hi, > > I could not find this issue in the issue tracker.  We’re trying to keep the > svn:mergeinfo properties on top-level directories, but I found  a few text > files in our repository that have the property.  When a merge is don

Merge Conflict on Windows with eol-style & mergeinfo properties

2011-02-23 Thread Varnau, Steve (Neoview)
Hi, I could not find this issue in the issue tracker. We're trying to keep the svn:mergeinfo properties on top-level directories, but I found a few text files in our repository that have the property. When a merge is done that should be just a branch synch-up merge, the files are marked as c