RE: Bug Report: Runtime Error on Merge of Range of Revisions

________________________________

From: Grother, William [mailto:William.Grother_at_numarasoftware.com]
Sent: Thursday, April 30, 2009 9:05 AM
To: users_at_tortoisesvn.tigris.org
Subject: Bug Report: Runtime Error on Merge of Range of Revisions

I recently upgraded from 1.5.8 to 1.6.1 and have had no trouble, until I
tried to merge some branch revisions into a copy of the trunk, and
received a strange runtime error in the middle of the merge instead of a
complete merge.

Process: Merge on Range of Revisions

Depth: Working copy

Range of Revisions: ALL (blank)

Ignore Whitespace changes

Merge ran all right at the start, and then about a third of the way
through, I received the following error:

Merge died at that point. I did a clean-up on the affected directory,
and attempted to restart the merge, but with no success. I have run the
merge three times now, and also have uninstalled and then reinstalled
TortoiseSVN, to no avail.

That looks exactly like what I experienced with 1.5.8. I should know
later today whether 1.6.1 has the same problem for me. If I recall
though, the nightly builds prior to 1.6.0 had been more stable in this
regard.

Just to make sure, you did an svn update or svn cleanup after upgrading
to 1.6.1, right? I think that's important to make sure your WC is fully
upgraded to the 1.6 format.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1996425

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-30 17:24:07 CEST