> On 03/23/2011 08:02 PM, David Huang wrote:
> >
> > On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
> >
> >> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
> >>> You are not giving much specifics, so how can people know what
> is going on
> >>> in your case?
> >>
> >> Specifics for complete 100% reproducable problem:
> >>
> >> do svn update for whole project
> >> create branch from trunk
> >> change one source file, not the one with the bogus mergeinfo,
> commit it.
> >> merge branch back to trunk
> >>
> >> before you commit the trunk, do a svn status
> >> You will see the bogus mergeinfo listed as a change to the
> trunk.
> >
> >
> > If you're sure that the mergeinfo is bogus, why not just delete
> it?
> > e.g., svn propdel svn:mergeinfo
> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
> >
> > http://www.collab.net/community/subversion/articles/merge-
> info.html might be worth a read too.
> >
>
> My specifics are substantially similar to those of Mr. Farrell,
> which
> are essentially what I laid out in my original post that started
> this
> thread. And yet Mr. Kolinko complains I've not given him enough
> specifics. One specific I can give is that our SVN server is still
> 1.5.4.
>
> Clearly something is broken here. If mergeinfo constantly requires
> merging when there are no changes, how is that to be fixed? The
> documents that have been posted here provide way too much
> information
> for my use case. I should not need to understand that much of
> subversion internals to fix this problem!
Basically, what it comes down to is the fact that the merge info on the files does not match the merge info on the parent folders. Whenever and item in the path has mergeinfo and a merge is performed that merge info is updated. (this is supposed to stop happening as of 1.7 I believe). As long as there is merge info on a file that isn't in the parent folder the merge info will remain at the file level. Once they match the merge info in the children (files) will be elided and you won't see this happen again.
I assume every time you see these property changes you are committing them?
BOb
Received on 2011-03-24 23:01:47 CET