Re: [Subclipse-users] Adding elements to svn:ignore
From: Douglas WF Acheson <dwfa_at_rogers.com>
Date: 2007-06-19 02:05:15 CEST
I have tried that several times and the error I am getting is shown below (taken from the eclipse log file). When I do a sync to see what the difference are, I get the sync view with 1 confilict for the root of the "scm" project. I have no idea how to resolve the conflict when it does not show me what the conflict is (or at least I do not know how to see the conflict).
Thx again ...
==== log message begins ====
!MESSAGE org.tigris.subversion.javahl.ClientException: Merge conflict during commit
!STACK 0
org.tigris.subversion.svnclientadapter.SVNClientException: org.tigris.subversion.javahl.ClientException: Merge conflict during commit
at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.commit(AbstractJhlClientAdapter.java:281)
at org.tigris.subversion.subclipse.core.commands.CheckinResourcesCommand$1.run(CheckinResourcesCommand.java:98)
at org.tigris.subversion.subclipse.core.SVNProviderPlugin$5.run(SVNProviderPlugin.java:456)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1737)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1719)
at org.tigris.subversion.subclipse.core.SVNProviderPlugin.run(SVNProviderPlugin.java:451)
at org.tigris.subversion.subclipse.core.commands.CheckinResourcesCommand.run(CheckinResourcesCommand.java:90)
at org.tigris.subversion.subclipse.core.SVNTeamProvider.checkin(SVNTeamProvider.java:139)
at org.tigris.subversion.subclipse.ui.operations.CommitOperation.execute(CommitOperation.java:108)
at org.tigris.subversion.subclipse.ui.operations.SVNOperation.run(SVNOperation.java:89)
at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144)
at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72)
at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:58)
Caused by: org.tigris.subversion.javahl.ClientException: Merge conflict during commit
at org.tigris.subversion.javahl.SVNClient.commit(Native Method)
at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.commit(AbstractJhlClientAdapter.java:275)
... 13 more
----- Original Message ----
On 6/18/07, Douglas WF Acheson <dwfa@rogers.com> wrote:
The project is a folder. The folder has property changes. Commit the
Mark
---------------------------------------------------------------------
---------------------------------------------------------------------
|
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.