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

[Subclipse-users] 1.1.4: Merge conflict during commit in freshly shared project

From: Gunnar Wagenknecht <gunnar_at_wagenknecht.org>
Date: 2006-07-28 00:08:19 CEST

Hi!

First I thought it was my mistake but now it looks like it's an issue in
Subclipse because it happend a second time with a different project and
a different repository (using JavaHL).

Steps to repeat:
1. Share project that was never shared before
2. As part of the share process commit some files
3. Do some modifications (rename a file, set some ignores)
4. Invoke commit on the project

Error:

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).

To solve the issue:
1. Right click the project and update it
2. Commit again

Cu, Gunnar

-- 
Gunnar Wagenknecht
gunnar@wagenknecht.org
http://wagenknecht.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jul 28 00:08:43 2006

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.