[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Subclipse-users] how to merge binaries? (and when to get a synchronized view merge?)

From: Johan Compagner <jcompagner_at_gmail.com>
Date: 2007-12-11 14:51:31 CET

Hi,

I want to merge binaries but it comes back as a conflict
when i do resolve conflicts i get:
java.lang.ClassCastException:
org.eclipse.core.internal.resources.Foldercannot be cast to
org.eclipse.core.resources.IFile
 at
org.tigris.subversion.subclipse.ui.subscriber.EditConflictsSynchronizeOperation$1.execute
(EditConflictsSynchronizeOperation.java:74)
 at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(
WorkspaceModifyOperation.java:104)
 at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1798)
 at org.eclipse.ui.actions.WorkspaceModifyOperation.run(
WorkspaceModifyOperation.java:116)
 at org.tigris.subversion.subclipse.ui.repository.RepositoryManager.run(
RepositoryManager.java:375)
 at
org.tigris.subversion.subclipse.ui.subscriber.EditConflictsSynchronizeOperation$4.run
(EditConflictsSynchronizeOperation.java:188)
 at
org.tigris.subversion.subclipse.ui.subscriber.EditConflictsSynchronizeOperation$5.run
(EditConflictsSynchronizeOperation.java:197)
 at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator.java:49)
 at
org.tigris.subversion.subclipse.ui.subscriber.EditConflictsSynchronizeOperation.run
(EditConflictsSynchronizeOperation.java:194)
 at
org.tigris.subversion.subclipse.ui.subscriber.EditConflictsSynchronizeOperation.run
(EditConflictsSynchronizeOperation.java:61)
 at
org.tigris.subversion.subclipse.ui.subscriber.SVNSynchronizeOperation.run(
SVNSynchronizeOperation.java:61)
 at org.eclipse.team.internal.ui.actions.ProgressDialogRunnableContext$3.run
(ProgressDialogRunnableContext.java:100)
 at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1798)
 at org.eclipse.team.internal.ui.actions.ProgressDialogRunnableContext$2.run
(ProgressDialogRunnableContext.java:97)
 at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(
ModalContext.java:113)

(its a jar library that i want to merge)

But then if this would work can i then say, i want the remove edition,
overwrite my local one?

Merging is a bit difficult with subclipse, now our big project is gone from
cvs to svn i really do miss the merging
of cvs in the synchronize view of eclispe.
I constantly had a pinned synchronization of HEAD -> BRANCH (with common
base) and that you could sync now and then
and the changes that where made since the last sync can then be previewed
and then applied or manually merged.

In SVN it seems that you have to merge first revision by revision (i can't
say do 10 -> 15 at once somehow)
that works directly on files so i get compile errors or merge conflicts
everywhere.

But then the merge conflicts i don't see those in a synchronize view so i
have to mannually search for the files and say Edit Conflicts
It would be nice that all the conflicts where marked as conflicts in a
synchonize view somehow and that you can then walk over
them with also an option keep mine, keep remote (especially with binaries)

johan
Received on Tue Dec 11 15:13:14 2007

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.