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

Re: Best way to update a vendor branch?

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-11-04 02:24:52 CET

"John Karp" <johnkarp@gmail.com> writes:
> I'm trying to update a vendor branch of MPlayer from 1.0rc1 to 1.0rc2.
> They're using subversion, I'm using subversion 1.4.4.
> First, I tried svn_load_dirs.pl. It presented me with a list of 850
> items to match up, and most of the corresponding items were on
> different pages. I'd rather not, and fear the day I'll have to switch
> between actual whole releases.

I don't know what command you ran with svn_load_dirs, but 850 seems
like a lot between two RC releases... much more than I would expect,
unless you've done some serious rearranging in your vendor branch.
Are you positive you were using svn_load_dirs correctly?

> Then, since both repositories are subversion, I thought I could try to
> use their history instead of having to manually enter it, through svn
> merge:
> svn merge svn://svn.mplayerhq.hu/mplayer/tags/MPlayer-1.0rc1/
> svn://svn.mplayerhq.hu/mplayer/tags/MPlayer1.0-rc2/
> That produced promising output for a while, but then died with:
> svn: Access scheme mixtures not yet supported
> Does anyone have any suggestions? I'm kind of stuck.

That error appears to be coming from check_scheme_match() in
Its doc string says:

   /* Return SVN_ERR_UNSUPPORTED_FEATURE if URL's scheme does not
      match the scheme of the url for ADM_ACCESS's path; return
      SVN_ERR_BAD_URL if no scheme can be found for one or both urls;
      otherwise return SVN_NO_ERROR. Use ADM_ACCESS's pool for
      temporary allocation. */

The "scheme" in question is the first part of the URL (e.g., the
"http" in "http://...", or the "svn" in "svn://...").

The two schemes on your command line are the same, and the fact that
it ran for a while before dying indicates that (maybe?) at least part
of your working copy is also using that scheme. But perhaps not all
of your working copy is? What does

   $ svn info -R | grep "URL: " | grep -v "URL: svn:/"

say? Or do you have svn:externals properties in use?

Is your vendor branch publicly visible -- that is, can anyone
reproduce this?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 4 02:25:10 2007

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.