> > I'm in the same environment as you describe, but the only times
> > svn:mergeinfo mysteriously reappear is when using svn copy, not merges.
>
> That's interesting. So you have something relatively similar happening,
> where svn:mergeinfo reappears after deleting it? It could be related I
> guess.
>
>
> > > And then the original bunch of 60 odd files get the svn:mergeinfo
> > property added.
> >
> > Maybe because amongst the unmerged revisions are old changesets that
> > include updates to the svn:mergeinfo property of these files? No, you
> > wrote you created the branch on a clean trunk.
>
> Yes, the trunk is clean, I actually ran this on it:
>
> svn propdel svn:mergeinfo -R
>
> and then I branched off, and the branch didn't have any svn:mergeinfo
> properties set on it. In fact, it's not once or twice, I've gone through
> this several times already for several feature branches, and every time
> the same thing happens: branch clean, update branch with clean trunk,
> svn:mergeinfo appears.
>
> > Maybe someone copied old revisions of files and their mergeinfo into
> > this clean trunk? But then you would notice the mergeinfo reappear in
> > trunk as well.
>
> Nope, since I consistently verify the trunk and it is clean of
> svn:mergeinfo.
>
> It is really a mystery, and I am beginning to think there's something
> wrong with my svn repo on the server, maybe it's corrupted in some way.
>
Can you create a new repository... import your project in, create a branch, do a merge and duplicate this? If so... show ALL the commands that you did from creating the repo into a script. I'm guessing there is some command or something you do and we are not seeing the full picture.
For example, you say you run
svn propdel svn:merginfo -R
on trunk. Do you then commit that? You don't say. You don't say if you are branching from a working copy or using a URL.
BOb
Received on 2010-05-18 16:47:45 CEST