Re: CVS (SCM) commits
Re: CVS (SCM) commits
- Subject: Re: CVS (SCM) commits
- From: joshua portway <email@hidden>
- Date: Sat, 1 Nov 2003 02:17:54 +0000
I suspect that the problem with committing the project to CVS isn't an
interface question, but because if you're working in a multi-user
environment and two people are working on the project there isn't any
way to merge the project files. Attempting to merge the massive XML
document in filemerge isn't practical, and I suspect wouldn't work
anyway, since the file seems to be a serialised ObjectiveC object graph
- if you just did a text merge all the object ID's would be screwed up.
We found that committing Project builder projects into CVS was often
disastrous and would most often result in a broken project when someone
else checked out.
Getting merging of projects to work would require a pretty complex
interface to do it properly - there would have to be some way to show
project differences, and some way to resolve the conflicts. I may be
wrong, but I suspect that such a complex bit of work is probably not
high on the xCode teams list of priorities.
In the meantime, the way we work is that one person in the team gets
nominated to maintain the project, and only that person is allowed to
commit the project. We just check it in using CVL. everyone else has to
delete their local copies of the project before updating.
We've built a very handy utility for automatically updating the XCode
project to reflect files that have been added or removed by other
people. It's an applescript studio app that displays a view of your
project showing just files that have been removed (ie they are in the
project, but don't exists on disk) or have been added (ie. if you have
a "File group" in your project which represents a folder on disk, and a
new file is added to that folder.
you can get the utility from :
http://scriptbuilders.net/category.php?id=1530
josh
On 31 Oct 2003, at 23:33, Daniel Hazelbaker wrote:
Two thoughts on the CVS integration.
1) In PB you could select the top-level project item to make a commit
changes in all modified files at once. Now when I try that in Xcode
(by
selecting the Project title in the list) the Commit option is grayed
out. I
can do it by going over to the file view and doing a select all and
going
that way. In my mind that should be an "automatic", when a folder is
selected in the treeview and you go to the SCM menu it should
interpret the
selection as if all items in that folder were selected.
2) When I did to the commit, it worked properly but it did not, by
itself,
remove the "M" status from the files. I had to click on them and then
they
went away. Guess it is forgetting to run the update status method on
the
treeview list?
Otherwise the SCM seems to work fine. I have not had any problems yet.
Neither of these two issues cause problems, just small annoyances. I am
curious though, if anybody knows if Xcode will let you import a new
project
as a new CVS module or if you have to do the initial setup with CLI
still?
Daniel
_______________________________________________
xcode-users mailing list | email@hidden
Help/Unsubscribe/Archives:
http://www.lists.apple.com/mailman/listinfo/xcode-users
Do not post admin requests to the list. They will be ignored.
_______________________________________________
xcode-users mailing list | email@hidden
Help/Unsubscribe/Archives: http://www.lists.apple.com/mailman/listinfo/xcode-users
Do not post admin requests to the list. They will be ignored.