Automerging

Hi List!

I've got an idea for making merging between branches a bit more
automatic. How about this:

* When running svn copy to create a new branch (maybe with a -b option
or so), two properties are created on the "root" directory of the new
branch: `svn:parent-uri' and `svn:parent-rev'. `svn:parent-uri' would
contain the URI of the source directory, and `svn:parent-rev' would
contain the revision that was copied (probably, but not necessarily,
HEAD).

* 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.

How about it? Not very elegant, but certainly work-saving for the common
case. I haven't started implementing it yet, since I'd like some
feedback first.

Fredrik Tolf

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 27 03:46:59 2005