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

Re: RFC: Cleanup some of the mergeinfo madness in our own repos

From: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 14 Nov 2008 09:09:21 -0500

On Fri, Nov 14, 2008 at 8:36 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Fri, Nov 14, 2008 at 6:24 AM, Paul Burba <ptburba_at_gmail.com> wrote:
>> Now for the specifics. I'd like to do one commit that simply removes
>> all subtree mereginfo on trunk and our release branches.
> I assume you meant to say "feature" branches here and not "release"
> branches? In which case I am +1. I do not think we should touch the
> release branches and if we do, we would at least need to preserve the
> subtree mergeinfo on things like CHANGES and COMMITTERS where it is
> legitimate.

Oops, yes, I definitely meant feature branches only. The release
branches can stay as they are. I was half asleep when I wrote that

> On Fri, Nov 14, 2008 at 7:41 AM, Stefan Sperling <stsp_at_elego.de> wrote:
>> How much of a problem is it when we use non-trunk builds?
>> I usually use the latest 1.5.x against our repo but would use
>> a trunk build if that helps with not having to clean up mergeinfo
>> every two weeks...
> You should be able to use 1.5.x builds with the exception being if you
> use it for a WC to WC copy it will create mergeinfo. But we could
> just clean it up if this happens.

Exactly, it is only during WC-to-WC copy/moves with <= 1.5.4 that are
the problem. Note that doing repos-to-wc or repos-to-repos copy/moves
don't avoid the problem as those still create what amounts to often
meaningless mergeinfo on the destination. Reducing/eliminating that
is something I'm looking into.

> A question I should probably raise separately but will do so here, is
> whether we should propose the reintegrate and copy changes for
> backport? I tend to think we should as these directly effect the #1
> issues that have been reported since 1.5 was released.

+1 on the recent (and any forthcoming) reintegrate fixes. I'm less
certain about the copy/move changes, those really aren't bug fixes.


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-14 15:09:37 CET

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.