[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: John Karp <johnkarp_at_gmail.com>
Date: 2007-11-08 17:37:05 CET

On 03/11/2007, Karl Fogel <kfogel@red-bean.com> wrote:
> "John Karp" <johnkarp@gmail.com> writes:
> > 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?

Most of the files match up; its a large project that apparently does a
lot of code reorganizations.

> > 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
> >
> The "scheme" in question is the first part of the URL (e.g., the
> "http" in "http://...", or the "svn" in "svn://...").

Ah. Internally here we're using Apache to serve subversion; whereas
MPlayer uses svnserve. So I started a svnserve on our server. It gets
through several hundred deletes and updates, but dies on a copy:
svn: Copyfrom-url
has different repository root than 'svn://svn/svnroot'

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

No externals.

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

No, it isn't, though the part of our repository in question is just a
simple svn import of the MPlayer sources.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 8 17:44:19 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.