Ulrich Eckhardt wrote on Fri, Dec 10, 2010 at 08:40:26 +0100: > Hi! > > I'm (now, finally) aware of the fact that svn:mergeinfo only came up with 1.5 > but this issue is about the behaviour when this is simply not supported. > Anyway, here's what I did: > > 1. I have a repository, FSFS, created (or, rather, svnadmin loaded) with a > Subversion 1.4. > 2. The commandline client is 1.6, running on Debian. > 3. The repository is accessed using a file:// URL. > 4. Check out a WC of a branch and change into it. > 5. "svn merge -c 1234 --record-only ^/trunk/foo" > > What happens is that this actually merged changes into the working copy, or, > rather, it caused conflicts trying to merge them in my case. I understand > that it simply can't do what I'm asking it to do, since the 1.4 repository > doesn't support svn:mergeinfo. However, and that is the issue, I would expect > an error ("can't record mergeinfo, not supported by the repository" or > somesuch).
> What it definitely shouldn't do is merge anything into my files, > since I explicitly asked it to not make any changes. > +1, that's a bug. > Also, but that is a minor issue, I would hope for a warning like "old > repository version, some features might be unavailable". Sounds like you want to add a call to svn_ra__assert_mergeinfo_capable_server() somewhere. If you find where, please let us know... (I'm not too worried about a warning that only applies to ≤1.4 servers with ≥1.6 clients --- the real answer is "upgrade the server too".) > By the way, I simply > ran "svnadmin upgrade" on the repository and now the above works. Do I gain > anything else by running a dump/load cycle? > > Cheers! > > Uli > > -- > ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html > FAQ: http://subversion.apache.org/faq.html > Docs: http://svnbook.red-bean.com/