I am using:
Windoz XP
Eclipse 3.0.1
Subclipse 0.9.25
We are connecting to a subversion server on a windoz 2K system.
I have several issues.
1) We are having problems with commits where there is a conflict.
For example, I have a file out on the repository called
overview.html.
Another developer can make changes to their local version; and if
there were no conflicts, the commit works fine. The version out
in the repo is v 281.
However, if afterwards, I sync the repository, make some changes to
my local copy (v 280) and then commit, it says there are conflicts.
This is as it should be. Now, I merge the conflicts into my local
version. I attempt to commit and I get this error.
org.tigris.subversion.javahl.ClientException: Transaction is out of
date
svn: Commit failed (details follow):
svn: Out of date:
'/MEMBERzplusV1/branches/developers/smcconnell20050126/source/overview.html'
in transaction '281-1'
org.tigris.subversion.svnclientadapter.SVNClientException:
org.tigris.subversion.javahl.ClientException: Transaction is out of
date
svn: Commit failed (details follow):
svn: Out of date:
'/MEMBERzplusV1/branches/developers/smcconnell20050126/source/overview.html'
in transaction '281-1'
org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter.commit(JhlClientAdapter.java:354)
org.tigris.subversion.subclipse.core.commands.CheckinResourcesCommand$1.run(CheckinResourcesCommand.java:94)
org.tigris.subversion.subclipse.core.SVNProviderPlugin$5.run(SVNProviderPlugin.java:399)
org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1673)
org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1693)
org.tigris.subversion.subclipse.core.SVNProviderPlugin.run(SVNProviderPlugin.java:394)
org.tigris.subversion.subclipse.core.commands.CheckinResourcesCommand.run(CheckinResourcesCommand.java:83)
org.tigris.subversion.subclipse.core.SVNTeamProvider.checkin(SVNTeamProvider.java:105)
org.tigris.subversion.subclipse.ui.operations.CommitOperation.execute(CommitOperation.java:63)
org.tigris.subversion.subclipse.ui.operations.SVNOperation.run(SVNOperation.java:90)
org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:159)
org.eclipse.team.internal.ui.actions.JobRunnableContext$3.runInWorkspace(JobRunnableContext.java:179)
org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
org.eclipse.core.internal.jobs.Worker.run(Worker.java:66)
This is EXTREMELY problematic, because this is the WHOLE CONCEPT OF
TEAM DEVELOPMENT through either CVS or Subversion!!!!!!! The ability
to merge conflicts together and make the changes.
I have also tried this through Tortoise; and am not able to do the same
thing. Am I missing a step? This is the way that I do the same
process through the Eclipse CVS repository connection.
2) In the Team Synch perspective, although I have a "commit" popup menu
item, I cannot commit from that perspective. I have to change to the
JAVA perspective to commit... Which is extremely cludgey... I can
"update" from this view, but I can't commit.
3) When I update or commit, the sync view still retains the elements
that I have updated or commited. If I resync or refresh my java
perspective the elements are still there. I have to EXIT ECLIPSE to
get this to work. This is also extremely problematic when I try to
convince the other developers to use Eclipse/Subclipse/Subversion
We decided to adopt Eclipse/MyEclipse/Subclipse and Subversion as our
development model. All the developers in the company are having the
same exact problem.
Are we missing a step in our copy/modify/merge/commit steps? Do we
need to add some configuration to our subclipse installation (we used
the
"update" method for the subclilpse install)?
Thanks for your help.
Stephen McConnell
=====
Received on Wed Feb 2 06:36:06 2005