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

Re: Merge handles svn:eol-style wrongly

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 04 Sep 2008 20:57:10 +0100

On Thu, 2008-09-04 at 18:09 +0100, Julian Foad wrote:
> I will write a test for this problem if no-one beats me to it.

It's merge_tests.py 107, added in r32907.

[[[
Add a test for a problem whereby a merge fails with the error
"Inconsistent line ending style" if the source change consists of
unifying the EOL style and then setting svn:eol-style=native.

* subversion/tests/cmdline/merge_tests.py
  (svn_merge): Allow a revision specifier string as an alternative to a
    single revision number.
  (merge_an_eol_unification_and_set_svn_eol_style): New test function.
  (test_list): Add the new test.
]]]

It's XFail.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-04 21:57:29 CEST

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