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!
> If you're sure that the mergeinfo is bogus, why not just delete it?
Because I'm scared as hell to mess with it! Who KNOWS what the effect
of deleting mergeinfo is? Once bitten, twice-shy. What side-effects
deleting mergeinfo will have? Can someone explain that to me?
If someone can tell me what the effects of deleting mergeinfo will be I
would be willing to try it.
