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

merging suddenly doesn't work

From: Andreas Pakulat <apaku_at_gmx.de>
Date: 2006-05-11 23:05:47 CEST


I have slight problem merging the changes between 2 revisions in from
"another" repository into the working copy of my repository. This used
to work without problems before I merged the svn:ignore propery changes
from "the other" repository.

To illustrate: The working copy is checked out from:

The "upstream" repository is at

And whenever upstream does some changes I merge them into the working
copy and commit to my repository.

Now I get this:

andreas_at_morpheus:~/compiling/aqbanking/svn/aqbanking.qt4>LANG=C svn merge --dry-run -r 1008:1010 http://aquamaniac.homelinux.net/svn/aqbanking/trunk
G ChangeLog
svn: Access scheme mixtures not yet supported ('http://aquamaniac.homelinux.net/svn/aqbanking/trunk/src/plugins/imexporters/yellownet' and 'https://www.apaku.de/subversion/aqbanking.qt4/trunk/src/plugins/imexporters')

While I do understand the error this didn't happen before, I could
always do something like

svn merge -r 1005:1008 http://...

Anybody got a hint why this "suddenly" happens to me?

I already found out about vendor branches and svn_load_dirs.pl, however
I think this either won't work for me, or I'm misunderstanding
something. I don't want the merged files to end up in a
branches/some-new-version directory in the repository, but I want them
in trunk.


You will gain money by an immoral action.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 11 23:07:04 2006

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.