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

PATCH: svnmerge between multiple repositories, same repo path

From: <dustin_at_v.igoro.us>
Date: 2007-05-01 20:02:19 CEST

Pursuant to discussion on the svnmerge mailing list, I wrote up some
patches to allow svnmerge to merge between multiple repositories, where
the repository path is the same in each. I've posted the patch to that
list, but heard nothing in return:

I have attached the series of patches, including unit tests. The tests
all pass (except the three that don't pass in the current HEAD) at each

Patches should be applied in this order:

call-it-locid.patch -p0
cleanup-abstraction.patch -p0
get_latest_rev_of_source.patch -p0
detect_bad_url.patch -p0
multiple_locid_fmts.patch -p0

Any comments would be appreciated, as would be a vision of how this
might get committed. Here are the patch descriptions:

> call-it-locid.patch
> fix comments, variable names for urls, directories, and
> "repostitory-relative paths" to be more explicit and call the
> repo-relative paths "location identifiers"
> cleanup-abstraction.patch
> clean up the locid abstraction, removing a few assumptions about
> the form of location identifiers; depends on previous patch
> multiple_locid_fmts.patch
> Add support for three types of identifiers for locations in the
> subversion properties:
> - path (the existing repo-relative path)
> - uuid (uuid://XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/repo/relative/path)
> - url
> 'svnmerge init' has a new flag, --location-type, allowing the user to
> specify which kind of location to use. After that, the format will be
> retained.
> I've also included two fairly independent patches for bugs I ran across
> in this process:
> get_latest_rev_of_source.patch
> analyze_source_revs() gets the latest revision of the *branch*
> repository, then proceeds to use that value against the *source*
> repository; it should get the latest revision of the *source*.
> detect_bad_url.patch
> Detect and error out on invalid URLs.


        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.

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

Received on Tue May 1 20:02:45 2007

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