Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-3373

svn merge accepts difference in context lines

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Critical
    • Resolution: Unresolved
    • Affects Version/s: 1.5.x
    • Fix Version/s: unscheduled
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      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: -->
      

      Original issue reported by themadsens

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated: