[Svnmerge] svnmerge.py avail --diff: differences that aren't there?

[Raman Gupta]

Thomas F. O'Connell wrote:
> I'm picking up where  a previous maintainer left off, and I'm noticing
> something unsusual. If I run the following from trunk:
> 
> svnmerge.py avail -S branches/branchx --diff
> 
> there is quite a bit of output, including helpful log messages. What's
> odd is that it seems like the changes have actually been committed to
> the trunk. I.e., if I look at a file that svnmerge.py is identifying as
> different in trunk and compare it to the file in branches/branchx using
> the filesystem diff, there is often no difference (and when there is, it
> is because of recognizable changes that have been merged from a
> different branch).
> 
> The question is: what do I do with these available changes? Block them?
> Go ahead and merge them?

If those changes really have been merged already, just clue in
svnmerge.py to that fact with:

svnmerge.py merge --record-only -r ...

Cheers,
Raman