[
https://issues.apache.org/jira/browse/SVN-3047?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16994192#comment-16994192
]
Nathan Hartman commented on SVN-3047:
-------------------------------------
Using svn 1.13.0, I (manually) carried out the last steps in the attached
1_doit.sh script and the resulting file with conflict markers looks like this:
{noformat}
This is the file 'iota'.
<<<<<<< .mine
Different new line with no newline.||||||| .r1
=======
New line with no newline.>>>>>>> .r2
{noformat}
> diff3 implementation should deal better with files (or props) that don't end
> in newlines
> ----------------------------------------------------------------------------------------
>
> Key: SVN-3047
> URL: https://issues.apache.org/jira/browse/SVN-3047
> Project: Subversion
> Issue Type: Bug
> Components: libsvn_diff
> Affects Versions: all
> Reporter: David Samuel Glasser
> Priority: Trivial
> Labels: bite-sized
> Fix For: 1.10-consider
>
> Attachments: 1_doit.sh
>
>
> {quote}Hmm, so I got a prop conflict on 1.4.x and selected (e)dit and got
> this:
> <<<<<<< (modified)
> /trunk:1-19523,[...],27263=======
> /trunk:1-19523,[...],26156>>>>>>> (latest)
> Shouldn't there be newlines before the middle and end conflict markers?
> {quote}
> ??From: David Glasser, Date: 2007-11-23, Subject: "prop conflict editing and
> newlines", [http://svn.haxx.se/dev/archive-2007-11/0982.shtml]??
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
