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

Re: Automerging

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2005-10-27 19:47:33 CEST

On 10/26/05, Fredrik Tolf <fredrik@dolda2000.com> wrote:
> On Thu, 2005-10-27 at 03:46 +0200, Fredrik Tolf wrote:
> > * When running svn merge without arguments (or maybe with a -a option)
> > the current directory would be checked for the existence of the
> > aforementioned pair of properties. If they exist, the equivalent of
> > (metacode) "svn merge -r$PARENT_REV:$HEAD_REV $PARENT_URI ." would be
> > run.
> I forgot to mention (in case it isn't obvious), that this operation
> would also update `svn:parent-rev' to the revision being merged in.

There are already several wrapper scripts that do this sort of thing
(svnmerge.sh and svnmerge.py come to mind, you can find both in the
contrib section of the main svn repository). The reason that the
functionality hasn't been merged into the main subversion program is
mainly that we haven't yet started the design discussions about what
"merge tracking" in Subversion will be like, and it's quite possible
that it will encompass quite a bit more than just tracking what the
last revision that was merged was. It's generally seen as better to
wait until we have time to do things right, rather than adding a
stop-gap feature that will have to be maintained forever even when we
have a better way to handle the problem.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 27 20:10:41 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.