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

Incorrect status printed by 'svn merge'

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Minor
    • Resolution: Fixed
    • all
    • 0.14.0
    • src
    • None
    • Linux

    Description

      If a file is added on two different branches, and I merge from one branch to 
      another, that file is shown as added
      
          A  ./file
       
      even when their content is completely different, and conflict markers
      are created.
      

      Original issue reported by volodya

      Attachments

        1. 1_merge_add.txt
          0.5 kB
          Subversion Importer

        Activity

          People

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

            Dates

              Created:
              Updated:
              Resolved: