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

Incorrect 3-way merge of "added" binary file which already exists in the repository and WC

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • trunk
    • 1.4.0
    • cmdline client
    • None

    Description

      Merging a binary file into a branch where that binary file exists
and is identical does not report a conflict, but leaves conflict
files in the working copy. Subsequent commands report the working
copy in conflict. The e-mail below has a reproduction recipe and
script.

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=104672

      Original issue reported by jlvarner

      Attachments

        1. 1_patch.txt
          4 kB
          Daniel Rall

        Activity

          People

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

            Dates

              Created:
              Updated:
              Resolved: