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

Re: Property Commit Problem

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-05-09 19:10:59 CEST

bryanalvord@vaticor.com (Bryan Alvord) writes:

> I add some svn:ignore properties to some directories in my project,
> which works fine, but when I try to commit I always get the
> following error:
>
> Sending .
> svn: Merge conflict during commit
> svn: Commit failed (details follow):
> svn: Your file '' is probably out-of-date.

Update your working copy to HEAD before committing propchanges on
directories.

From the book:

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

   "[...] you cannot commit a metadata change to a directory unless
   it's fully up-to-date. [...] A directory's working revision
   defines a specific set of entries and properties, and thus
   committing a property change to an out-of-date directory may
   destroy properties you've not yet seen."

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 9 19:12:01 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.