You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by du...@v.igoro.us on 2007/05/01 18:02:19 UTC

PATCH: svnmerge between multiple repositories, same repo path

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:
  http://www.orcaware.com/pipermail/svnmerge/2007-April/000891.html
  http://www.orcaware.com/pipermail/svnmerge/2007-April/000911.html

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

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

-- 
        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.
        http://www.zmanda.com/

Re: [PATCH]: svnmerge between multiple repositories, same repo path

Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
dustin@v.igoro.us wrote:
> On Tue, May 01, 2007 at 01:02:19PM -0500, dustin@v.igoro.us wrote:
>> 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.
> 
> Sorry to self-reply here, but does anyone want to second this patch,
> before I put it on the tracker?  Alternately, does anyone think it's a
> terrible idea, and want to eviscerate me for even conceiving of it?

Dustin,
Thanks for following up on this.  After looking at your previous mail,
I've not reviewed the patches, but I do have a couple of suggestions.
While you did include summaries of your patches, they don't follow our
log message guidelines[1].  By submitting your patches with appropriate
messages, they are much more likely to get reviewed.

The patch submission guidelines[2] also note that "a patch submission
should contain one logical change; please don't mix N unrelated changes
in one submission -- send N separate emails instead."  Sending five
patches in one mail may be a bit difficult for some people to grok.

May I suggest either grouping the patches together in logical chunks, or
submitting them serially?  (Submit one, discuss, apply, repeat.)  It may
take more time that way, but the reviewers are more likely to understand
what each patch is doing.

[1] http://subversion.tigris.org/hacking.html#log-messages
[2] http://subversion.tigris.org/hacking.html#patches

(I've also updated the subject to include the brackets around [PATCH] so
that it gets filtered correctly.)

-Hyrum


Re: PATCH: svnmerge between multiple repositories, same repo path

Posted by du...@v.igoro.us.
On Tue, May 01, 2007 at 01:02:19PM -0500, dustin@v.igoro.us wrote:
> 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.

Sorry to self-reply here, but does anyone want to second this patch,
before I put it on the tracker?  Alternately, does anyone think it's a
terrible idea, and want to eviscerate me for even conceiving of it?

Dustin

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