[jira] [Commented] (SVN-4659) svn patch doesn't restore properties at the working path root

["Stefan Sperling (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/SVN-4659?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15623408#comment-15623408 ] 

Stefan Sperling commented on SVN-4659:
--------------------------------------

The problem here is that 'svn patch' does not support svn:mergeinfo at all.

'svn diff' does not print mergeinfo changes in a unidiff-like style. It pretty-prints them, and 'svn patch' does not yet parse this pretty-printed representation.

We already have an issue for this problem: SVN-3747
Would you be OK with me flagging the issue you filed as a duplicate of 3747?


> 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)