Re: [Subclipse-users] conflicts not detected during merge, exception after revert, Eclipse hang at 100% CPU

"Georg-W. Koltermann" <Georg.Koltermann@mscsoftware.com> wrote on
09/27/2006 07:33:13 AM:

> could you, perhaps, clear the tree cache after a branch or tag has been
> created?

Something is likely possible. Please file an issue.

> I repeated the test today. It turns out the conflicts are classified as
> "warning", and I routinely filter out warnings because I have so many
> Java warnings in our software (missing JavaDoc, unused variables etc.
> etc.). That's why I didn't see anything.
>
> What do you think of making the merge conflicts errors instead of
warnings?

With code, like Java, the conflict markers that are inserted cause compile
errors. So that was one of the reasons we made it a warning -- just so
that it would stand out against the errors. You can file an issue.

> > The normal procedure to fix a conflict produced by
> > Subversion are to resolve the conflicts in the file using either an
editor
> > or the Edit Conflicts action that we supply.
>
> The Edit Conflicts, when called on a binary file (*.so), does nothing
> visible in the UI and throws this exception in the .log:

Please file an issue.

> My remaining question was whether anyone observes erratic behavior
> sometimes as well, like Eclipse hogging the CPU when subclipse is being
> used.

Has it ever happened? Sure. Is it normal or expected? No.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Sep 27 15:18:40 2006