[
https://issues.apache.org/jira/browse/SVN-3373?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17465844#comment-17465844
]
Daniel Sahlberg commented on SVN-3373:
--------------------------------------
I was reviewing this to find some interesting holiday project.
It should be noted that the line numbers are exactly the same on the "wrong"
<element> as in the branch.
The basic issue is still reproducible under Subversion 1.14.1. I've attached a
test repo where merging r4 to /trunk cases the same issue.
It seems that GNU patch 2.7.6 manages to patch the correct <element> given a
unidiff. (If it is supplied with a normal diff it doesn't work, on the other
hand this is expected since the normal diff doesn't have any context lines).
For now, I'm leaving this issue but I wanted to document my findings in case
someone else looks at it.
> svn merge accepts difference in context lines
> ---------------------------------------------
>
> Key: SVN-3373
> URL: https://issues.apache.org/jira/browse/SVN-3373
> Project: Subversion
> Issue Type: Bug
> Components: libsvn_client
> Affects Versions: 1.5.x
> Reporter: Subversion Importer
> Priority: Critical
> Fix For: unscheduled
>
> Attachments: 3373_repodump.txt
>
>
> {noformat:nopanel=true}
> A change was erroneously merged into a differing context. Specifically the
> commenting-out of an XML tag was applied to one with a different name!
> The following changes:
> Index: 052-scproto.spec.xml
> ===================================================================
> --- 052-scproto.spec.xml (revision 18344)
> +++ 052-scproto.spec.xml (revision 18345)
> @@ -37,14 +37,14 @@
> </element>
>
>
> - <!-- From unit: -->
> + <!-- From unit: -
> <element token="600" name="lamp-logV0">
> <attribute name="ioId" type="int64"/>
> <attribute name="numberOfFlashes" type="uint32"/>
> <attribute name="highestCurrent" type="uint32" />
> <attribute name="lowestCurrent" type="uint32" />
> <attribute name="timestamp" type="uint32" />
> - </element>
> + </element> -->
>
>
> <!-- From unit: -->
> Merged to the release branch as:
> Index: 052-scproto.spec.xml
> ===================================================================
> --- 052-scproto.spec.xml (revision 18435)
> +++ 052-scproto.spec.xml (revision 18436)
> @@ -37,14 +37,14 @@
> </element>
>
>
> - <!-- From unit: -->
> + <!-- From unit: -
> <element token="600" name="lamp-log">
> <attribute name="ioId" type="int64"/>
> <attribute name="numberOfFlashes" type="uint32"/>
> <attribute name="highestCurrent" type="uint32" />
> <attribute name="lowestCurrent" type="uint32" />
> <attribute name="timestamp" type="uint32" />
> - </element>
> + </element> -->
>
>
> <!-- From unit: -->
> {noformat}
> Original issue reported by *themadsens*
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
