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

Re: direct merging from remore repository/working copy vs svn_load_dirs.pl + merge

From: John Peacock <john.peacock_at_havurah-software.org>
Date: Mon, 26 May 2008 20:03:40 -0400

Eric DE MAULDE wrote:
> My software is OFBiz (Apache), an ERP with a lot of files, and its code
> is hosted in a remote Subversion repository.
> The personnal devolpment covers around 5 - 10 % of the trunk.
> In order to update the trunk and merge it (1 or 2 times a month) with my
> personal development,
> what is the best to use ?

You should take a look at SVK instead:


which is a Subversion client on steroids. In particular, it allows you to
create a local mirror of some other repository and then maintain a local branch
of that repo. Typically, merging the upstream changes is as simple as:

        $ svk pull

from within a checkout of your local branch.

Since you are maintaining a long-term branch of a public repository, it will be
much much much easier to use SVK to simply keep a local mirror and merge the
upstream changes with your code on a regular basis.



To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-27 02:03:09 CEST

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.