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

Unable to merge into working copy of deleted branch

    XMLWordPrintableJSON

    Details

      Description

      As cmpilato described here,
      http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=139984, merge
      is broken when the WC merge target points to a repository location that no
      longer exists or was replaced.
      
      Not delving to deep into this right now, but the problem is
      merge.c:populate_remaining_ranges() when we call get_full_mergeinfo() to obtain
      the working and implicit mergeinfo for a subtree.  get_full_mergeinfo calls
      svn_client__repos_locations() to make sure the merge source pegged at the
      subtree's working revision is the same object as that at the youngest requested
      merge revision -- See comment "Our underlying APIs can't yet handle the case
      where the peg revision isn't the youngest of the three revisions" in
      svn_client__repos_locations() -- in the referenced example above this is not the
      case and svn_client__repos_locations() errors out, taking the whole merge with it.
      

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              pburba Paul Burba
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: