I realize this is going to be a lousy bug/error report already, but I don't
have any more information that what's below, sorry.
I'm running the latest versions of TortoiseSVN (1.6.2) and the Collabnet
server (1.6.1), whatever was current as of two days ago when I did a fresh
install. They are running on my Windows XP SP3 machine, all current and
patched up, running reliably.
I had a trunk at version 169, and had been working for a long time on a
single branch that was at version 282. (I know that's bad, I should have
folded the branch back into the trunk a long time ago.)
Tonight I tried to merge the branch back into the trunk. First I tried to
use the TortoiseSVN "reintegrate branch" option (middle one in the Merge
dialog). I tried the "Test Merge" button first, but it failed because
"retrieval of mergeinfo" is not supported. So I thought, maybe the mergeinfo
is only required for the test, whereas the actual merge might work. So I
tried the real merge, not the test. That failed too, for the same reason.
So I went back to the trunk, found the last version there, and then tried to
merge all revisions between 169-282 on to the trunk. This kind of worked,
with many tree conflicts and other conflicts. As I recall, I chose "use
local" for all of the prompt dialogs, thinking that my working copy (if that
was what local meant) worked, so I should locals. Then the error dialog
shown above appeared.
Now I've received this error dialog twice, and am hoping that my whole
repository is not corrupted. J
Again, I apologize for not having a reproducible sequence to trigger the
assertion. I have no idea what the assertion even means.
I hope this helps.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-21 01:17:46 CEST