Re: The bug that r20892 attempted to fix seems to be back on the trunk
On Sun, 27 Aug 2006, Lieven Govaerts wrote:
> Eric Hanchrow wrote:
> >lgo asked me to report this: The bug that r20892 attempted to fix
> >seems to be back on the trunk ... or, at least, the trunk is behaving
> >in a confusing way.
> >This is using r21125 from http://svn.collab.net/repos/svn/trunk.
> >I merged a branch into the trunk:
> > $ /usr/local/stow/svn-trunk/bin/svn merge -r10043:10070
> > svn://10.10.10.37/branches/soodo-cleanup-2/ .
> >I noticed some conflicts:
> > CU client/build.pl
> > $
> >It looks as if the entire file is in conflict, presumably because of
> >the line endings (I am pretty sure that I added the "svn:eol-style"
> >property, with a value of "native", on that file, in the branch; and
> >did that on a Windows machine.)
> Revision r20892 solved the problem of the svn:eol-style propchanges
> during update, apparently the same thing during merges isn't fixed yet.
> I've added two new tests in merge_tests.py in r21280 for testing
> eol-style issues.
Does an issue still need to be filed for the 'merge' portion of this
Received on Tue Sep 5 21:19:18 2006
- application/pgp-signature attachment: stored
This is an archived mail posted to the Subversion Dev