i advice you to put all generated files to ignore, for instance
svn rm lib/model/doctrine/base/*
svn propedit svn:ignore lib/model/doctrine/base
# put here * or *.php
and so on
I had conflicts with base files earlier many times

BUT deploying the project you have to rebuild all

cache/* and log/* put to ignore also

On Apr 21, 5:27 pm, jaubry <[email protected]> wrote:
> Hi,
> I am working on a symfony project written by many developpers.
> The project is under svn.
> Each developper works on its module. But sometimes, a developper need
> to change the schema.yml and regenerate the model. All the class files
> in lib/model,form,filter have changed and are put in the svn.
>
> When I svn update my project, I retrieve all the files (schema +
> classes). My files are up to date.
> How can I simply update my mysql db. Right now, I play the
> doctrine:build --all --and-load and recreating the classes.
> Therefore my classes are now different from svn.
>
> I suppose many of you work in a team and svn.
> Do you have best practices to collaborate on a symfony project ?
>
> Thanks by advance.
> Jerome
>
> --
> If you want to report a vulnerability issue on symfony, please send it to 
> security at symfony-project.com
>
> You received this message because you are subscribed to the Google
> Groups "symfony users" group.
> To post to this group, send email to [email protected]
> To unsubscribe from this group, send email to
> [email protected]
> For more options, visit this group 
> athttp://groups.google.com/group/symfony-users?hl=en

-- 
If you want to report a vulnerability issue on symfony, please send it to 
security at symfony-project.com

You received this message because you are subscribed to the Google
Groups "symfony users" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/symfony-users?hl=en

Reply via email to