Project Kenai Documentation and Training: Bugs: org.tigris.subversion.javahl.ClientException: Merge conflict during commit

Project Kenai Documentation and Training was started in June 2008, is owned by kenaiadmin, and has 118 members.

» Join This Project

org.tigris.subversion.javahl.ClientException: Merge conflict during commit

» Back to forum topics

3 posts

Replies: 2 - Last Post: January 10, 2009 14:33
by: Varun Nischal

« Older Topic » Newer Topic

showing 1 - 3 of 3

Varun Nischal

Posted: January 09, 2009 14:06 by Varun Nischal

» Permalink

Hello,

I got this exception today, I tried few times committing the code and finally it worked, don't know why this occurred.. Is it due to Kenai or SVN support in NB, or something else?

org.tigris.subversion.javahl.ClientException: Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory '.' is out of date; try updating
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).

The SVN command returned with an error which indicates that some files in your working copy are out of date.
Run update and attempt your command again.

Regards,
Varun

Paul	Posted: January 09, 2009 18:09 by Paul » Permalink
	I'll ask the obvious question, just to rule it out. Did you update your source files with the svn update command before checking them in? It looks like that's what the messages are saying.

Varun Nischal	Posted: January 10, 2009 14:33 by Varun Nischal » Permalink
	I think I just overlooked it, thanks anyways!

Replies: 2 - Last Post: January 10, 2009 14:33
by: Varun Nischal

« Older Topic » Newer Topic