Damian L. Powell wrote:
> Hi,
>
> I have been using the TortoiseSVN nightly builds in order to assess the
> new merging capabilities but I seem to have hit a snag and wondered if
> you guys could shed any light on it - Googling and searching TSVN & SVN
> archives hasn't revealed anything that rings a bell so far!
>
> I was using 11362 for quite some time and performed several merges with
> it (all of which were updates-on-trunk -> branch-of-trunk). However
> since updating to 11417, I have been unable to perform an update or a
> checkout from the trunk or the branch. The error message returned is:
>
> "Unable to parse unordered revision ranges '2166-5117' and '1534-1664'"
>
> The fact that this occurs on the trunk as well as the branch is a worry
> since I haven't merged anything from the branch back to the trunk yet.
> Also, my branch was created in revision 5128 which doesn't fit into
> either of these ranges so why should TSVN care (since no merge
> properties would have been applied in those revisions).
>
> If I checkout a subset of the trunk then it works okay but I get errors
> on the subset of the trunk that was modified on the branch.
>
> Any help would be greatly appreciated.
I'm not sure why this happens, but maybe the merge tracking db got
messed up a little big (it's still beta after all).
Try removing the mergeinfo.db file in your repository 'db' subfolder.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Nov 30 19:28:31 2007