On 5/26/05, Dale Worley <dworley@pingtel.com> wrote:
> > From: Russ Brown [mailto:pickscrape@gmail.com]
> >
> > At this point I got the idea that the problem may be something to do
> > with the eol-style property. I checked it and it was indeed set; its
> > value being 'native'. So, I removed the property from the file and
> > tried the change again. This time, the diff worked correctly.
>
> It's not exactly clear to me how you got into this situation, but it appears
> that you managed to get the eol-style property set without checking in the
> file from a WC, so Subversion hadn't yet edited the file's contents to match
> the eol-style.
>
>
Could this have anything to do with the fact that we imported our
repository from our original CVS one using cvs2svn? I think this is
the first working-copy commit on that file since the repository was
originally imported.
This may also explain a number of large conflicts we've been getting.
Would this mean that every single file in the repository that has that
property set will appear to have been completely changed the first
time it is commited since the import? If that's the case, I presume
that if two developers change a file for the first time (on different
branches) the merge would conflict because both changes will appear to
have modified the entire file.
Or am I off the mark again?
--
Russ
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 26 17:07:35 2005