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

Re: Automerging

From: John Peacock <jpeacock_at_rowman.com>
Date: 2005-10-27 20:21:45 CEST

Garrett Rooney wrote:
> 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).

I guess you could also consider SVK to be a "wrapper script" in that
sense; it also handles automerging (a couple of different ways at that).
  In fact, you can see some of SVK's custom props in the Subversion
repository itself:

$ svn pl -v http://svn.collab.net/repos/svn/trunk
Properties on 'http://svn.collab.net/repos/svn/trunk':
   svn:ignore : ChangeLog*
...snip...

   svk:merge : 40bec6f9-eef0-0310-8400-9b45a50af7ca:/local/trunk:90
422c9f7f-73e9-0310-916f-f579f4d99a6a:/local/pool-cleanup:1951
ae6c956b-9dc6-0310-97b2-e73af4192982:/svn/local:8265
c9b7866f-f5e4-0310-b3ee-a2e1643c603f:/svn/local/new-auto-merge:10428

Get SVK here:

        http://svk.elixus.org

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
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:35:40 2005

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