Here's the situation: I just did a reintegrate from the HEAD of branch_X into trunk. I committed everything.
At this point, the two branches should be identical. Afterwards, I didn't change either branch, except to commit the reintegrate itself to trunk, and to commit a record-only merge to branch_X, to block the reintegrate from being merged back. Now I update my copy of trunk, and repeat the exact same merge. I should see no changes, right? Wrong. I see two PDF files, that Subversion thinks were updated. EVERY TIME I do a reintegrate from this branch, these same two files show up as updates. Nobody is touching the files, and their contents are identical in both branches. Why is this happening? Jacob
