The issues you have already open should be fine. It might be a week
or more before we can really look at it as we are wrapping up some
other work. If someone else wants to take a crack, we can certainly
review it,
Mark
On Wed, Oct 28, 2009 at 7:01 PM, Jacob Weber <jacob_at_jacobweber.com> wrote:
> When I do a merge from the trunk into a branch, I get four conflicts. When I double-click any of them in the Merge Results, I get an alert popup with no text in it, just an icon. In addition, four log entries appear in the log the first time I double-click a conflict. They look like this:
>
> !ENTRY org.tigris.subversion.subclipse.ui 1 0 2009-10-28 13:42:34.290
> !MESSAGE org.eclipse.core.internal.resources.Marker cannot be cast to org.tigris.subversion.subclipse.ui.decorator.ConflictResolutionGenerator
>
> I did the merge using the CollabNet Merge Client, using Merge a Range of Revisions. I'm reporting the bug to CollabNet, but I thought I'd check here to see if you guys think this is a Subclipse problem. It seems like it could be, and there's a bug in the Subclipse tracker (#955) that refers to a similar error.
>
> Let me know if you think I should open a ticket for Subclipse.
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2412307
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
>
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2412676
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-10-29 15:58:22 CET