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

merge between different repositories reports conflicts where there are none

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Trivial
    • Resolution: Invalid
    • Affects Version/s: 1.6.x
    • Fix Version/s: ---
    • Component/s: contrib/svnmerge.py
    • Labels:
      None
    • Environment:

      Windows XP

      Description

      When merging changes from one repository to another unrelated one (except for
      the availability of similar code), it sometimes occurs that merge reports conflicts.
      When inspecting the conflict, it does not mark any conflicts (using
      TortoiseSVN's conflict resolver TortoiseMerge), hence I select resolved.
      
      Closer inspection reveals that the new version has Linux end of lines, while I'm
      working on Windows XP.
      
      So there's 2 things happening here:
      - Merge reports conflicts where there aren't actually any
      - line endings are being replaced by non-native line endings
      

      Original issue reported by michael_edna

        Attachments

        1. 1_notarealconflict2.JPG
          285 kB
          Subversion Importer

          Activity

            People

            • Assignee:
              blair Blair Zajac
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: