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

Merge conflict during commit

From: Christophe Prud'homme <prudhomm_at_debian.org>
Date: 2003-04-30 19:28:18 CEST

Hi,

I've got this message in two different dirs in my svn tree

svn ci -m"my message here"
Sending .
svn: Merge conflict during commit
svn: Commit failed (details follow):
svn: Your file '' 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).

If I run commit individual files, no problem.
If I use . for those two dirs where I have the message it fails. Note that svn fails to give
me the name of the file. Where should I look for this problem?

This problem started to appear after I created svn:ignore property for these dirs.

Best regards
C.

-- 
| Christophe Prud'homme, http://augustine.mit.edu/~prudhomm
| ICQ UIN: 24560867 Alias: Jesunix
| Key fingerprint = 3703 50DE 7A9F 024E 0F26  0D07 A18F B40B D4BE 1450
|
| If it doesn't work, force it. If it breaks, it needed replacing anyway.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 30 19:30:51 2003

This is an archived mail posted to the Subversion Dev mailing list.