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

Re: libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 11 Feb 2011 17:52:15 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> But does cause 3 FAILs in merge_tests.py:
> FAIL: merge_tests.py 34: conflict markers should match the file's eol style
> FAIL: merge_tests.py 35: handle eol-style propchange during merge
> FAIL: merge_tests.py 110: dav skelta mode can cause spurious conflicts

110 was spurious, I had other changes in my tree. 

-- 
Philip
Received on 2011-02-11 18:52:57 CET

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

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