[Vtigercrm-developers] vtiger CRM 5.0.1 Released

Joe Bordes joe at tsolucio.com
Tue Oct 10 09:36:19 PDT 2006

Hi Dennis,

The general lines are something like this:

You need to know your initial SVN version, from where you started
modifications. This is probably 9535 or similar. You can get a clue
typing "svn info" in your 5.0.0 vanilla

Now you get into your development copy and type:

svn merge -r9535:9621

This will take your development version from 9535 to 9621, and it will
do it in your working directory, so it will update and merge the new
code with your existing code.

Now you have to go over the list that svn gave you and check all the
lines that start with "C", these are the files svn could not update
(conflict), so you have to fix the by hand.

After this you should have an updated version with your changes.

Please use this email with care, mileage may vary, so make copies before

These are the steps I just took to get my working and development copies
up to date.

Regards, Joe

El mar, 10-10-2006 a las 11:02 -0400, Dennis Grant escribió:
> >We are happy to bring out yet another release of vtiger CRM, with much more
> >capabilities, interesting code contributions and whole lot of Bug fixes.
> Cool.
> Now I have a question that I really need help with:
> What is the best process for merging this patch into our development trees using svn?
> Here is the current state:
> 1) I have a copy of the vanilla 5.0.0 tree checked out in my local repository;
> 2) My working copy contains all my changes; none of them are checked in;
> 3) By typing "svn diff >DG_patch.txt" I generate a patch file that converts vanilla 5.0.0 to my fork. 
> 4) To install a production installation of my fork, I first install vanilla 5.0.0, then apply my patchfile.
> What I need to do is this:
> 1) Generate a merged working copy that is 5.0.1 + my patches
> 2) End up with a local repository that contains vanilla 5.0.1
> 3) Generate a patch file that converts a "5.0.0 + my patches" installation to a "5.0.1 + my patches" installation.
> What's the best way to do this? I know there are merge commands in svn, but I have no idea how to use them.
> DG
> _______________________________________________
> Reach hundreds of potential candidates - http://jobs.vtiger.com 

More information about the vtigercrm-developers mailing list