Inconsistent merge on subdirectory behavior?
From: Chris <devnullaccount_at_yahoo.se>
Date: Wed, 11 Apr 2018 14:56:51 +0000 (UTC)
I wanted to reverse-merge some accidental changes on a subdirectory on my branch and svn really confuses me in this. Is the below behavior from subversion intended or have I stubled on a bug?
I wanted to reverse-merge revision 1000 on all the files in the directory "sub/dir", below illustrated with only one file.
wcroot> svn diff --summarize -c 1000 sub/dir
I tried a few different versions of this with e.g. -r 1000:999 with identical results.
Then I did the following, which I thought would be more of the same:
wcroot> cd foo/bar
So now it does what I wanted to.
Is it intended that merge should do different things if I use "." or "sub/dir" as my WCTARGET? I find it confusing and it was mostly luck that I stumbled on the right solution. "svn help merge" does not seem to indicate that these two use cases should be any different, but I may misread it.
TIA,
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.