[SVN-4659] svn patch doesn't restore svn:mergeinfo property at the working path root

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Duplicate
• Affects Version/s: 1.9.4
• Component/s: cmdline client

Environment

Reproduced on FreeBSD 11.0 but doubt it is OS specific

• Assignee: Unassigned
• Reporter: John Baldwin
• Created: 31/Oct/16 19:09
• Updated: 27/Oct/18 16:28
• Resolved: 01/Nov/16 10:25

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.

Issue Links

• duplicates: SVN-3747 'svn diff' and 'svn patch' support of svn:mergeinfo