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

Re: [Subclipse-users] Adding elements to svn:ignore

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-06-19 02:34:19 CEST

On 6/18/07, Douglas WF Acheson <dwfa@rogers.com> wrote:
> I have tried that several times and the error I am getting is shown below (taken from the eclipse log file). When I do a sync to see what the difference are, I get the sync view with 1 confilict for the root of the "scm" project. I have no idea how to resolve the conflict when it does not show me what the conflict is (or at least I do not know how to see the conflict).

You just need to do update before commit. Folders get out of date if
anything beneath them has been committed to the repository. You
cannot commit a change to a folder if it is not at the HEAD revision.

These errors come out of Subversion, we are not making these rules in Subclipse.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Jun 19 02:34:17 2007

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.