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

Re: Merge conflict during commit

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-30 19:35:02 CEST

"Christophe Prud'homme" <prudhomm@debian.org> writes:

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

You changed a property on ".", then tried to commit. So you're
effectively trying to commit a new version of the current working
directory.

But you can't commit propchanges to directories unless they're
up-to-date. Run 'svn up' first -- then 'svn commit .' will work fine.

P.S. Read the last paragraph on this page:

  http://svnbook.red-bean.com/html-chunk/ch02s03.html#svn-ch-2-sect-3.4

---------------------------------------------------------------------
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:37:09 2003

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