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

Re: How is svn work with ModelMaker?

From: Martin Tomes <lists_at_tomes.org>
Date: 2004-12-27 19:56:43 CET

Diviner wrote:
> Martin Tomes wrote:
>> If you have several people working on the same code at the same time
>> either:
>> - Each have your own separate ModelMaker model files, then there
>> will never be a need to merge a model.
>> - or, use the same ModelMaker files but when there is a conflict
>> revert the file, merge the generated files, ensure they compile in
>> Delphi and then re-import them into the model.
> Yes. It is my case for development in furture. I affraid that after a
> unit file is marged, model file cannot be merged at the momemt. My
> thinking is, in order to commit the changing, user temporarily takes
> either one version of model file to commit to SubVersion server right?
> Before someone do re-import, in the mean time the model file is a
> Incomplete State in SubVersion server. If somehow ModelMaker updates the
> unit file(that has been merged successfully) base on this Incomplete
> State's model file, it causes losing code.

I think I understand. To avoid the ModelMaker model overwriting changed
  Dephi units make sure that you don't enable code export (the padlock
toolbutton) until you have imported all of the changed units. That way
ModelMaker will not re-generate an old version of a file based on it's

Martin Tomes
echo 'martin at tomes x org x uk'\
  | sed -e 's/ x /\./g' -e 's/ at /@/'
The Subversion Wiki is at http://www.subversionary.org/
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 27 19:57:36 2004

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

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