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

[PATCH] 'svnmerge' tool for automating merges

From: Archie Cobbs <archie_at_dellroad.org>
Date: 2004-09-27 01:18:53 CEST


Attached is a tool called "svnmerge" that we're using locally to
automatically track merges from our trunk to branches. It stores the
merged-in revisions as a list in a property on the branch directory.

I know there are other developments in this area in the works, so
this may be of limited value (and I haven't been following this
mailing list so my information is out of date). In any case, it has
proven useful here while more integrated merge tracking is being
worked on.

Here is the help message to give people an idea of how it works:

> Usage:
> svnmerge init [-s] [-v] [-n] [-r revs] [-f file] head
> Initialize merge tracking from "head" on the current working
> directory. "head" is either an URL or a working directory;
> in the latter case, the corresponding URL is used. "revs"
> specifies the already-merged in revisions; it defaults to
> "1-HEAD", where HEAD is the latest revision of "head".
> svnmerge avail [-s] [-v] [-l] [-d] [-r revs] [branch-dir]
> Show unmerged revisions available for "branch-dir" as a
> revision list. If revision list "revs" is given, the revisions
> shown will be limited to those also specified in "revs".
> Options specific to this command:
> -l Show corresponding log history instead of revision list
> -d Show corresponding diffs instead of revision list
> svnmerge merge [-s] [-v] [-n] [-r revs] [-f file] [branch-dir]
> Merge in revisions specified by "revs" into "branch-dir"
> from the "head" location previously specified by init.
> "revs" is the revision list specifying revisions to merge in.
> Already merged-in revisions will not be merged in again.
> Default for "revs" is "1-HEAD" where HEAD is the latest
> revision of the "head" repository (i.e., merge all available).
> Options common to multiple commands:
> -v Verbose mode: output more information about progress
> -s Show subversion commands that make changes
> -n Don't actually change anything, just pretend; implies -s
> -f Write a suitable commit log message into "file"
> -r Specify a revision list, consisting of revision numbers
> and ranges separated by commas, e.g., "534,537-539,540"
> "branch-dir" is always a working directory and defaults to ".".

Also, any suggestions or bug fixes are greatly appreciated!


Archie Cobbs * CTO, Awarix * http://www.awarix.com

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Mon Sep 27 01:19:11 2004

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.