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

RE: svn:mergeinfo on 1,300 files when only a few changed?

From: Nicholas Curry <Nicholas.Curry_at_cofunds.co.uk>
Date: Wed, 8 Apr 2009 09:27:54 +0100

Funnily enough, a similar problem was the driver for my post yesterday, "How is mergeinfo calculated for hierarchies?": http://svn.haxx.se/users/archive-2009-04/0385.shtml

Tyler Roscoe was kind enough to respond, and he mentioned that:
* this article might be helpful to understand how mergeinfo is supposed to work: http://www.collab.net/community/subversion/articles/merge-info.html (I only just got in this morning, so I haven't had time to read it yet)
* he had previously posted a similar question on both the user and dev mailing lists around a month ago (http://svn.haxx.se/users/archive-2009-03/0444.shtml, http://svn.haxx.se/dev/archive-2009-03/0597.shtml) and didn’t get any replies to his queries, from which he concluded that no-one actually knows how mergeinfo works :-|

I hope this helps (though I suspect it won't)

Cheers,
Nick

-----Original Message-----
From: Martin Bischoff [mailto:tinu44_at_gmail.com]
Sent: 08 April 2009 07:35
To: users_at_subversion.tigris.org
Subject: Re: svn:mergeinfo on 1,300 files when only a few changed?

I had the same problem, when I was merging changes from trunk to a
feature branch. After the merge, about 80% of the modified files only
had the svn:mergeinfo added/updated and only a few files had actual
(content-)changes.

I never got a definitive answer why this happens or what I'm supposed
to do, so I then decided to commit all modified files. I'd still like
to know more about this situation:
- why exactly does it happen
- should the files with only metadata-changes be commited
- once I have reintegrated my feature branch to trunk, should I remove
all svn:mergeinfo from these files

Here are the links to my posts (on svn-users and tsvn-users):

http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1219898
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1225619

-Martin

On Wed, Apr 8, 2009 at 02:40, Jim Biancolo <jim_at_biancolo.com> wrote:
> Hi folks,
>
> Sorry, a bit out of my depth with this one and I could use some help...
>
> I have been branching and merging happily on an existing project for quite awhile, and just started a new project with a new host, pretty standard setup:
>
>   /trunk
>      /html
>   /branches
>      /stable
>   /tags
>
> I checked out trunk to a "foo" folder and branches/stable to a "foo_stable" folder.  I made a change to a few files under foo_stable/html, committed them, and then merged into foo.  I right-clicked foo itself (using Tortoise) to do the merge, as I understand you aren't supposed to merge from subdirectories with the new merge tracking.  The merge took forever, and when it was finally done it had set svn:mergeinfo on each and every file (1,300+, not just the handful that had changed).  So, classic blunder, I committed thinking maybe this was a one-time, first merge kind of thing.  I know, I know...
>
> Anyway, I later repeated the steps above with a different set of changes, again the merge took forever, and again svn:mergeinfo was set on every file rather than on just the few that had changed (or on the root level, which is where I thought this property would be set).  Haven't actually committed that one yet.
>
> Is this behavior correct?  And if it's not, is there a way for me to fix this behavior?  I can't imagine I want to have 1,300 changes showing up in my log every time I merge a branch.
>
> If it helps, Tortoise reports these versions:
>
>   TortoiseSVN 1.6.0, Build 15855 - 32 Bit , 2009/03/21 12:36:36
>   Subversion 1.6.0,
>   apr 1.3.3
>   apr-utils 1.3.4
>   neon 0.28.4
>   OpenSSL 0.9.8j 07 Jan 2009
>   zlib 1.2.3
>
> Thanks!
>
> Jim
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1586897
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

********************************************************
This e-mail has been swept for viruses by Cofunds.
For more information on this service, please
contact the IT Service Desk on Ext: 7060 or itservicedesk_at_cofunds.co.uk.
********************************************************

Cofunds Limited, 1st Floor, 1 Minster Court, Mincing Lane,
London EC3R 7AA. Registered in England and Wales
No 3965289. Authorised and regulated by Financial Services Authority. Phone: 0845 604 4001, or visit our website at www.cofunds.co.uk.
Telephone calls may be recorded for monitoring purposes.
**************************************************************************
The information contained in this message may be CONFIDENTIAL and is intended for the addressee only. Any unauthorised use, dissemination of the information, or copying of this message is prohibited. If you are not the addressee, or believe this email to have been sent in error, please notify security_at_cofunds.co.uk immediately and delete this message.
Although this e-mail and any attachments are believed to be free of any virus, or other defect which might affect any computer or system into which they are received and opened, it is the responsibility of the recipient to ensure that they are virus free and no responsibility is accepted by Cofunds for any loss or damage from receipt or use thereof.
This email does not create or vary any contractual obligations between Cofunds Limited and the addressee. Any views or opinions are solely those of the author and do not necessarily represent those of Cofunds Limited.
Those communicating with us by electronic mail will be deemed to have accepted the risks associated with interception, amendment, loss and late or incomplete delivery. They will also be deemed to have consented to our monitoring of such communications.
**************************************************************************

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-08 10:30:52 CEST

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