Mysterious Conflict

I'm trying to create a branch.

We do it in a weird way here - we "svn checkout", make some changes to
the externals, "svn switch" and finally "svn commit" as the new branch.
Yes, "svn copy" would make more sense, but I'm stuck with what we have.

Anyway, I was trying to do "svn commit" just once at the end of this, at
the top of the source tree, but that appears to have been missing some
things - probably most of the externals. Even though I'm not giving "svn
commit -N", it doesn't seem to be operating recursively.

So I whipped up a little bash code that would traverse the source tree,
looking for directories having a ".svn" subdirectory, and doing an "svn
commit" in each of them.

And this mostly seems to click along, until... The Mysterious Conflict.

I get a conflict every time, on a file I just checked out. It's always
the same file. The revision numbers do vary, and they seem to be
increasing. The revision numbers do not correspond to the revision
numbers in the source tree I svn switch'd from, and they do not
correspond to the revision numbers in the source tree I svn switch'd to.
IOW, if I "svn log -v" the file in either source tree, there are no
modifications listed on those revision numbers.

What might cause such a thing?

Anyone seen it before?

Should I just "svn resolve" and get on with life? Or could this be an
indicator of a serious issue?

Thanks!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-29 04:05:30 CEST