[Vtigercrm-developers] vtiger CRM 5.0.1 Released
dgrant at accuratetechnologies.com
Wed Oct 11 06:18:06 PDT 2006
> Not much to me, svn should have "noticed" that the changes were
> made and simply merged them. But i'm no expert so ...
This is the problem we're facing here:
The use of SVN is sweet crunchy goodness. It's the only way we'll be
able to realistically manage community development, and to prevent the
continued generation of private forks (like my own)
I support the use of SVN. I *want* to make it easier to roll changes
from vtiger into my fork, and I *want* to merge as much of my fork back
into vtiger core as is practicable; ideally, the only things I should be
maintaining in my fork are a couple of business-specific hooks into
other services, and the install is otherwise pur laine vtiger.
But I'm struggling a little bit with the svn best practices, and I'll
bet I'm not alone - and this needs to get worked out and documented in
simple-to-understand HOWTO style so people in similar circumstances can
"just make it work" without needing to become SVN gurus.
> Use the merge command IN your working copy directory. I mean apply the
> same merge command in the working directoy which contains your patches
> and you will get an updated version with your patches.
That's what I did... but I'm not sure if that was the result. I have to
look more closely at what SVN did on the merge. My gut is that I now
have a 5.0.1 repository, but a 5.0.0 working copy....
I'll be spending some time on this today to work this out.
> Again, remember to make copies, I am no expert in this, just talking
> from my recent experience.
Amen, brother. We're all in this together.
More information about the vtigercrm-developers