Gino Filicetti <firstname.lastname@example.org> wrote on 08/22/2005 03:53:07 PM:
> As for conflicts, I just noticed that issue a few minutes ago after
> running some tests. I'm wondering if there's a way to take the output
> of the conflict (the 3 files and the modified original file with the
> diff output in it) and switch over to Tortoise to resolve the
> conflict, or maybe just go to WinMerge. I'll have to play around with
> it and see what Tortoise itself does to resolve conflicts.
Eclipse 3.x allows you to use TortoiseMerge or a built-in editor. In 2.x,
just use the TortoiseSVN Edit Conflicts action and then refresh back in
Eclipse when you are done.
> >>"svn status --show-updates". Unfortunately, it looks like Subclipse
> >>only has the command "Show pending operations" which is analogous to
> >>"svn update".
> > Show Pending Operations is svn status with the -u switch. It is your
> > local status.
> Well, I hope you're right and I've got something misconfigured. But
> when I click on "Show pending operations", the SVN Console view shows
> "svn status"... it doesn't use the -u switch and doesn't show any
> remote status. That's at least what I'm seeing, let me know if it's
> different for you.
Sorry, that was an important type. I mean to say it is svn status withOUT
the -u. I was responding to your comparison of the view to svn update. I
just wanted to point out it is actually svn status.
> Mark my friend.. I hope you never have to struggle with the issues I'm
> dealing with at the moment. The reason I'm stuck on E2.x is because of
> the Eclipse plugins in our product. They only run in E2.x and there
> isn't a huge effort to port them to E3.x at the moment (mainly because
> the customers we're selling to seem to be using WSAD 5.x). Regardless
> of the reasons, I'm pushing to get our stuff ported to E3 ASAP, but
> unfortunately, it's only being treated as a spare time/weekend project
> at the moment.
That is mainly why I still have to use WSAD as well. In my case, our
plugins have to support both versions of Eclipse for the same reason ( a
lot of our customers are still using WSAD). I found your reply a bit
humorous though since you started the thread by saying it should have been
relatively easy for us to support both and there there were not a lot of
API differences. Yet the reason you are using it is because you have not
updated your own product.
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
Received on Tue Aug 23 06:00:36 2005