John Baldwin created SVN-4659:
---------------------------------
Summary: svn patch doesn't restore properties at the working path
root
Key: SVN-4659
URL: https://issues.apache.org/jira/browse/SVN-4659
Project: Subversion
Issue Type: Bug
Components: cmdline client
Affects Versions: 1.9.4
Environment: Reproduced on FreeBSD 11.0 but doubt it is OS specific
Reporter: John Baldwin
Priority: Minor
To reproduce:
{quote}
cd /path/to/some/branch
svn merge -c NNN ^/trunk
svn diff > foo.patch
svn revert -R .
svn apply foo.patch
{quote}
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:
{quote}
Skipped missing target: '.'
{quote}
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.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
