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

record-only merges which add new subtree mergeinfo don't record mergeinfo describing merge

VotersWatch issueWatchersLinkCloneUpdate Comment AuthorReplace String in CommentUpdate Comment VisibilityDelete Comments
    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • 1.7.x
    • 1.7.0
    • libsvn_client
    • None

    Description

      Since r880264, --record-only merges actually drive the editor and apply
      svn:mergeinfo diffs (see http://svn.haxx.se/dev/archive-2009-09/0520.shtml). 
      This makes --record-only merges transitive.
      
      All well and good, but if the applied diff adds explicit mergeinfo to a subtree
      that had none prior to the merge, no mergeinfo describing the --record-only
      merge itself is recorded on the added subtree mergeinfo.  This is *very* similar
      to issue #3975.
      
      This bug has occurred in our own repository, see
      http://svn.haxx.se/dev/archive-2011-08/0025.shtml
      

      Attachments

        Activity

          This comment will be Viewable by All Users Viewable by All Users
          Cancel

          People

            pburba Paul Burba
            pburba Paul Burba
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Slack

                Issue deployment