len0x
2nd April 2003, 20:16
If you have a permission from me or any admin to commit to the CVS (i.e. you're on developer list) please make sure you DO know how CVS works (in any case contact me before you start comming anything)
We might have slight problem with group development because Delphi has two types of files (*.ddp and *.dfm) which are binary (and commited as binary by me). (and well I know that *.dfm is kinda text, but with binary data, which I think will be impossible to merge)
So - those files (basically representing form state) are _impossible_
to merge, i.e. if I modify a form, someone else modifes the form and commits - my changes are lost! (and more over I left in inconsistent state with *.pas files)
So if you plan to modify GUI - we have to agree on what's the best way to do that.
Modifying just *.pas files should be simple (CVS merge will take care of concurrent changes)
P.S. and don't commit project files unless you've added new units...
We might have slight problem with group development because Delphi has two types of files (*.ddp and *.dfm) which are binary (and commited as binary by me). (and well I know that *.dfm is kinda text, but with binary data, which I think will be impossible to merge)
So - those files (basically representing form state) are _impossible_
to merge, i.e. if I modify a form, someone else modifes the form and commits - my changes are lost! (and more over I left in inconsistent state with *.pas files)
So if you plan to modify GUI - we have to agree on what's the best way to do that.
Modifying just *.pas files should be simple (CVS merge will take care of concurrent changes)
P.S. and don't commit project files unless you've added new units...