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

Mergeinfo still not eliding in Subversion 1.6.5

From: Todd C. Gleason <tgleason_at_impac.com>
Date: Tue, 29 Sep 2009 14:11:34 -0700

I have done a test upgrade to Svn 1.6.5 for both client and server and
I'm not seeing any improvements in elision. Client was previously
running Svn 1.6.1 and server was running 1.5.2, both on Windows, access
via Apache. I upgraded the repo with svnadmin upgrade.

 

I had a look at http://svn.haxx.se/users/archive-2009-08/0681.shtml and
http://svn.haxx.se/users/archive-2009-03/0444.shtml and it is clear that
other users have seen similar issues, without seeing any resolution.
I'm hoping for some explanation as to what is going on, what's expected,
and whether mergeinfo is supposed to proliferate the way we see it
happening.

 

Basically I had a lot of subtree mergeinfo from people doing merges, and
I merged a revision from one branch. I ran the merge at the top of my
WC. The result was that the entire WC's mergeinfo was updated to
reflect the branch and revision merged, even if nothing under any given
path was updated. To illustrate, I had something like this:

 

/trunk (has mergeinfo)

          /A (has mergeinfo)

          /B (has mergeinfo)

          /C (has mergeinfo)

/branches

          /1

                   /A

                   /B

                   /C

 

Revision X affects files under /branches/1/A. When I merge revision X
into my WC at /trunk, I see mergeinfo changes on /trunk, /trunk/A,
/trunk/B, and /trunk/C. It would be find if the existing mergeinfo was
being elided into /trunk itself and removed from /trunk/B and /trunk/C,
but that's not happening. Instead it's just adding more mergeinfo to
reflect the merge from /branches/1. I have no idea why /trunk/B and
/trunk/C need this, since they aren't directly affected by the merge.

 

I'm also not noticing any performance improvement here; it still took
several minutes to do this operation. I thought I would see a
noticeable improvement over the 1.5.2. Note that I didn't time the
operation.

 

Can anyone explain whether I'm doing something wrong, or whether we will
eventually see an improvement here? Do I need to do a dump/load to see
this? Or do a full new checkout? I did my initial checkout using Svn
1.6.1.

 

--Todd

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2401786

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-29 23:17:48 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.