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

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 ====
!ENTRY org.tigris.subversion.subclipse.core 4 -6 2007-06-18 19:51:44.125

!MESSAGE org.tigris.subversion.javahl.ClientException: Merge conflict during commit
svn: Commit failed (details follow):
svn: Your file or directory '.' is probably out-of-date
svn: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).

!STACK 0

org.tigris.subversion.svnclientadapter.SVNClientException: org.tigris.subversion.javahl.ClientException: Merge conflict during commit
svn: Commit failed (details follow):
svn: Your file or directory '.' is probably out-of-date
svn: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the 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
svn: Commit failed (details follow):
svn: Your file or directory '.' is probably out-of-date
svn: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).

    at org.tigris.subversion.javahl.SVNClient.commit(Native Method)

    at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.commit(AbstractJhlClientAdapter.java:275)

    ... 13 more
==== log message ends ====

 
Regards,
Douglas WF Acheson

----- Original Message ----
From: Mark Phippard <markphip@gmail.com>
To: users@subclipse.tigris.org
Sent: Monday, June 18, 2007 7:43:05 PM
Subject: Re: [Subclipse-users] Adding elements to svn:ignore

On 6/18/07, Douglas WF Acheson <dwfa@rogers.com> wrote:
> What you wrote I understand and agree with. So, more to the point, how to I get Subclipse to not indicate to me that the Eclipse project is out of sync with the repo? It is very distracting to see a project out of sync, but when you expand the project there are no files that are out of sync. I have include my original email to recap my situation

The project is a folder. The folder has property changes. Commit the
property changes.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Jun 19 02:05:42 2007

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