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].
Received on 2009-04-08 08:36:29 CEST