[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Bug when merging to pre-1.5 repositories

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Fri, 10 Dec 2010 08:40:26 +0100


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.

Also, but that is a minor issue, I would hope for a warning like "old
repository version, some features might be unavailable". 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?



ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
Visit our website at <http://www.dominolaser.com/>
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
Received on 2010-12-10 08:40:39 CET

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.