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

Conflict on merging eol-syle:native property change only

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Major
    • Resolution: Unresolved
    • None
    • None
    • None
    • None

    Description

      • make a branch from trunk
      • add eol-style:native attribute to some file in trunk
      • merge that changes into branch
      • in subversion 1.8.x, 1.9.x you will get a conflict, in subversion 1.7.x you will not

      Attachments

        1. repro.zip
          0.7 kB
          Stefan Hett

        Activity

          People

            Unassigned Unassigned
            Andrey.Roussev Andrey Roussev
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated: