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

Deletion of file in a new directory when merging multiple revisions is failing in special cases

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: 1.6.x
    • Fix Version/s: unscheduled
    • Component/s: contrib/svnmerge.py
    • Labels:
      None

      Description

      Deletion of file in a new directory when merging multiple revisions is failing
      in special cases.
      Following situation
      svn add xxx/trunk/testdir
      svn add xxx/trunk/testdir/myfile1
      svn add xxx/trunk/testdir/myfile2
      svn commit
      #results in revision x
      rm xxx/trunk/testdir/myfile1
      svn commit
      #results in revision y
      
      when I now merge in revision x and y in come command
      svn merge -c x,y ...
      svn commit
      
      the file xxx/trunk/testdir/myfile1 is still part of the branche I have merged
      the revision into. mergeinfo is showing revision x and y, but definitely changes
      of revision y are not properly merged
      

      Original issue reported by famousit100

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated: