subversion-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Julian Foad (JIRA)" <j...@apache.org>
Subject [jira] [Updated] (SVN-3047) diff3 implementation should deal better with files (or props) that don't end in newlines
Date Thu, 28 Jun 2018 20:26:00 GMT

     [ https://issues.apache.org/jira/browse/SVN-3047?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Julian Foad updated SVN-3047:
-----------------------------
    Description: 
{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]??

  was:
{noformat:nopanel=true}
http://svn.haxx.se/dev/archive-2007-11/0982.shtml
{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 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
(v7.6.3#76005)

Mime
View raw message