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

Re: Augmenting patch format to improve support for vendor branching?

From: John Peacock <john.peacock_at_havurah-software.org>
Date: Sat, 23 Feb 2008 15:05:21 -0500

Auke Jilderda wrote:
> In the latter approach, the challenge is how to maintain
> a set of customisations, or patches, on another team's component in a
> controlled, reliable (and, arguably, therefore automated), and easy/low
> effort manner. The current functionality relies on the svn_load_dirs.pl
> script to reconstruct structural changes such as adds, deletes, and
> renames upon importing a new code drop.

See also SVK[1], which allows you to mirror one repository and maintain local
changes in your own private branch, with full capability to pull changes (i.e.
from the mirror to your branch) as well as push changes (from your branch to the
mirror). SVK already has smart merge support that SVN 1.5 will have when that
is released (different design though).

Before you object that this is a SVK user tool, realize that the SVK repository
is an ordinary Subversion repository (and can itself be published via DAV or
svnserve), as long as only SVK is used to merge to the mirrored paths.

John

1. http://svn.bestpractical.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-23 21:05:15 CET

This is an archived mail posted to the Subversion Dev mailing list.