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

Make subtree merge smarter enough by not to do series of merge on subtree that is eventually getting deleted at a later stage of merge.

    XMLWordPrintableJSON

Details

    Description

      Merge on parent having subtree with differing mergeinfo which is getting deleted
      by the current merge fails.
      
      Expected behaviour.
      Subtree should be deleted.
      Actual behaviour,
      ../subversion/libsvn_fs_fs/tree.c:633: (apr_err=160013)
      svn: File not found: revision 8, path '/A/D/gamma'
      
      As a part of this change it is nice to skip any prior subtree merges and just
      delete it as recommended by Peter lundblad's proposal
      http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=565086
      

      Original issue reported by kameshj

      Attachments

        1. 2_2876.patch
          4 kB
          Subversion Importer
        2. 1_merge-test-2.sh
          2 kB
          Subversion Importer

        Issue Links

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: