Re: Many questions about SCM and svn in XCode
Re: Many questions about SCM and svn in XCode
- Subject: Re: Many questions about SCM and svn in XCode
- From: Niels Meersschaert <email@hidden>
- Date: Fri, 18 Aug 2006 08:59:02 -0400
Benoit,
I believe refresh simply checks to see whether the local resource is
in sync with the repository so that it can update the needs update
display. Update actually brings it into sync.
The out of date message means your local copy isn't updated before
making the merge. I.E. your local version is based on 1.3, while the
repository is at 1.4. Choose update and then commit & you should be
fine. It's good to get into that habit anyway in case someone else
committed a change while you were working locally. You'd have the
same problem with Eclipse in that case, since the message is from
subversion, not XCode (which merely passes it to you).
Niels
On Aug 18, 2006, at 8:38 AM, benoit cantin wrote:
Hello,
I use SCM in XCode with svn, but it is not always as simple as I
would like it to be.
First of all, what is the difference between options "update entire
project" and "refresh entire project" ?
Many times, I got this kind of error "svn: Out of date:
'test.eomodeld/test.plist' in transaction '19-1'" when comitting
from svn client in console (I sometimes commit from console since
SCM fails in XCode just saying "Commit failed" with no detail). Any
suggestion (it's not really WO, but you may have an idea).
I can solve conflicts on java file as well as on eomodels files.
But how can you solve conflicts on project file ? Currently, most
of the time, conflict on project file is leading me to a deadlock.
As a result, I have to create a new project and copy all my Web
Components, etc...
I wonder if I not going to use Eclipse instead of XCode for
forthcoming projects due to SCM problems.
Thank you,
--
Benoit
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
40mac.com
This email sent to email@hidden
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden