You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Eric DE MAULDE <er...@free.fr> on 2008/05/26 21:49:02 UTC
direct merging from remore repository/working copy vs svn_load_dirs.pl + merge
Hi,
I read the documentqtion and the FAQ, subject :
" How can I maintain a modified version (a "vendor branch") of third-party software using Subversion?"
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 ?
svn_load_dirs.pl ...
+
svn merge ...
or
svn merge -r XXX:YYY http://svn.apache.org/repos/asf/ofbiz/trunk customWorkingCopy
How can you import the first official trunk ?
svn export ... officialWorkingCopy
+
svn import officialWorkingCopy svn://localhost/
Thanks
Eric
Re: direct merging from remore repository/working copy vs svn_load_dirs.pl + merge
Posted by Eric DE MAULDE <er...@free.fr>.
Thanks for your suggestion.
I'm installing SVK
Eric
> 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:
>
> http://svk.bestpractical.com
>
> 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.
>
> HTH
>
> John
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
>
> --
> No virus found in this incoming message.
> Checked by AVG. Version: 7.5.524 / Virus Database: 269.24.1/1468 - Release
> Date: 26/05/2008 15:23
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: direct merging from remore repository/working copy vs svn_load_dirs.pl
+ merge
Posted by John Peacock <jo...@havurah-software.org>.
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:
http://svk.bestpractical.com
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.
HTH
John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: direct merging from remore repository/working copy vs svn_load_dirs.pl + merge
Posted by Ryan Schmidt <su...@ryandesign.com>.
On May 26, 2008, at 16:49, Eric DE MAULDE wrote:
> I read the documentqtion and the FAQ, subject :
> " How can I maintain a modified version (a "vendor branch") of
> third-party software using Subversion?"
>
> 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 ?
>
> svn_load_dirs.pl ...
> +
> svn merge ...
>
> or
>
> svn merge -r XXX:YYY http://svn.apache.org/repos/asf/ofbiz/trunk
> customWorkingCopy
>
> How can you import the first official trunk ?
> svn export ... officialWorkingCopy
> +
> svn import officialWorkingCopy svn://localhost/
You cannot merge across repositories. You can only merge within a
single repository.
So I think only svn_load_dirs.pl is a viable solution.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org