Re: Certain files always appear in my reintegrate merges

Forgot to mention: I'm using SVN 1.6.11 client and 1.6.5 server.
Jacob

On May 22, 2010, at 7:31 PM, Jacob Weber wrote:

> 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
Received on 2010-05-24 12:40:10 CEST