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

svn patch doesn't restore svn:mergeinfo property at the working path root

VotersWatch issueWatchersLinkCloneUpdate Comment AuthorReplace String in CommentUpdate Comment VisibilityDelete Comments
    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Minor
    • Resolution: Duplicate
    • 1.9.4
    • None
    • cmdline client
    • None
    • Reproduced on FreeBSD 11.0 but doubt it is OS specific

    Description

      To reproduce:

      cd /path/to/some/branch
      svn merge -c NNN ^/trunk
      svn diff > foo.patch
      svn revert -R .
      svn apply foo.patch

      This will apply all of the file changes in the merged change, but it will not apply the mergeinfo property change on the current working directory. Instead it outputs the error message:

      Skipped missing target: '.'

      However, the '.' directory in this case does exist. At the moment I am working on merging a feature to an older branch from a trunk that spans multiple commits from trunk some of which have conflicts to resolve during the merges. I am using 'svn diff' to checkpoint progress after resolving conflicts so that I can 'svn revert' and restart if I find that the easiest way to resolve a conflict is to add an additional change to my queue of changes to merge. Having 'svn patch' do a full application would make this simpler. As it is I have to follow my 'svn patch' with a manual 'svn merge --record-only -c NNN,MMM,XXX' to restore the mergeinfo.

      Attachments

        Issue Links

        Activity

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

          People

            Unassigned Unassigned
            bsdjhb John Baldwin
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Slack

                Issue deployment