[
https://issues.apache.org/jira/browse/SVN-4737?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Bert Huijben closed SVN-4737.
-----------------------------
Resolution: Not A Problem
The merge command you invoke is documented as:
merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]
(see `svn help merge`)
In this case you have to pass two arguments, one which specifies what you want
to merge to what location. The source is required, while the target is not...
and when it is not provided the current directory is used.
In this issue report the changes to the subdirectory are merged to the ancestor
directory, which is probably a no-op.
Please compare the result with passing `foo/bar` twice on the commandline.
> Metge on subdirectory does not work
> -----------------------------------
>
> Key: SVN-4737
> URL: https://issues.apache.org/jira/browse/SVN-4737
> Project: Subversion
> Issue Type: Bug
> Affects Versions: 1.9.x
> Environment: Commandline client on any operating system has this
> issue.
> Reporter: Chris
> Priority: Minor
> Attachments: repro-template.sh
>
>
> Attached reproduction script shows the issue in detail.
> A short description of the issue:
> * Doing "svn merge -c -1000 foo/bar" does not revert changes in the foo/bar
> subdirectory
> * Doing "cd foo bar" before doing "svn merge -c -1000 ." reverts the changes
> Both of the above should be equivalent and the former seems to be a bug. In
> the below thread, it was also shown that diff can have hte same behavior.
> Discussion about this bug was done here:
> [https://mail-archives.apache.org/mod_mbox/subversion-users/201804.mbox/%3C20180415141034.GA31629%40ted.stsp.name%3E]
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
