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

Combining several (external) repositories with my local WC

From: Maxim Veksler <hq4ever_at_gmail.com>
Date: 2007-03-30 19:52:12 CEST

Hello list,

The question is this: Can I merge into my local repository sources
from other publicly available svn repositories?

For example, I have repoA that holds python code.
I would like to have django [1] under repoA/trunk/3rdParty/django/, so
that when I do "svn up" in my working copy I get updates both from my
local repository (http://x.y.z/repoA/trunk) and from django repo. When
I do a commit OTOH, I will commit to my local repo both my own changes
and the updated files pulled down from djangoproject.com.

Now the optional part: If I modify a file from the django tree, that
creates a conflict with the upstream source subversion will analyze
the situation and deduce that I'm higher in the hierarchy of sources,
those allow me to have this file modified (and not being synced from
now on, yet keeping the other files synced on each update)

The way I can do it do is by having a cron job doing an "export" from
the django repo into a local copy and committing the changes at the
end of the procedure, a very uncomfortable solution because it will
simply "forget" to delete files if upstream deletes them but are
committed into my local copy (can be worked around by rsync'ing and
acting on the output, but who wants to go there...)

Any ideas on the above would be great.

The fast and the curies,

[1] svn co http://code.djangoproject.com/svn/django/trunk/

Maxim Veksler
"Free as in Freedom" - Do u GNU ?
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 30 19:52:31 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.