Re: Eclipse Crashing During Merges

It's funny that you say that, because TortoiseSVN chokes on this one
(though it threw an error, and didn't hard crash).

I can try the command line, but I want to go through the same steps, and
the default diff3 is too hard for all the conflicts in this merge. I'm
trying to get Meld 1.7.3 (which has the support baked-in, apparently) to
work with SVN so I can resolve conflicts better. (If anyone happens to know
how to integrate the two properly, some explanation would be appreciated.)

Thanks,
Jamie

On Wed, Jun 26, 2013 at 3:56 PM, Stephen Elsemore <[email protected]>wrote:

> If the error is actually causing Eclipse to crash, and there is no related
> error in the log when you restart, then it seems likely that the error is
> in the SVN executables.  It might be worthwhile trying the same merge from
> the command line.
>
> > -----Original Message-----
> > From: Jamie Jackson [mailto:[email protected]]
> > Sent: Wednesday, June 26, 2013 12:33 PM
> > To: [email protected]
> > Subject: RE: [Subclipse-users] Eclipse Crashing During Merges
> >
> > Hi Stephen,
> >
> > Thanks for the response. I don't see anything in the logs that seems to
> > correspond. However, I'm confident I can get it to fail again (this
> particular
> > merge makes Eclipse disappear every time), so if someone can tell me how
> > to elicit more helpful info from Eclipse, I'll give it a try.
> >
> > Thanks,
> > Jamie
> >
> > ------------------------------------------------------
> > http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessag
> > eId=3059195
> >
> > To unsubscribe from this discussion, e-mail: [users-
> > [email protected]].
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3059197
>
> To unsubscribe from this discussion, e-mail: [
> [email protected]].
>

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3059203

To unsubscribe from this discussion, e-mail: [[email protected]].