| Previous topic :: Next topic |
| Author |
Message |
vipart
Joined: 11 Jan 2008
Posts: 46
Location: Vilnius, Lithuania
|
| Posted: Thu Jan 17, 2008 8:37 am Post subject: svn branch for 5.0.4 ? |
|
|
Hello. Not long ago I started translating vTiger to Lithuanian language while vTiger latest version was 5.0.3.
The problem is that I would like to make a release of 5.0.3 language pack (translation is no complete yet) while being able to translate the newest vTiger 5.0.4 RC files. In other words I would like translation files to be 5.0.4 version in the SVN repository (forge.vtiger.com) while being able to translate 5.0.3 files in the same repository.
Is this possible? Maybe some brach/tag should be applied? What is the best way to solve it? Thanks |
|
| Back to top |
|
prasad.a
Joined: 01 Aug 2007
Posts: 976
|
| Posted: Thu Jan 17, 2008 8:59 am Post subject: svn branch for 5.0.4 ?<br /><a href="viewtopic |
|
|
Hi vipart,
Having different branches is a good idea to support translation for various version.
You should tag the branch when ever you make a release.
Tags are considered as read-only copy of source and branches under goes source changes.
trunk should general have the stable version of the source (which can be of one of the branches)
Hope you are clear with this.
Regards,
Prasad
vtiger Team |
|
| Back to top |
|
vipart
Joined: 11 Jan 2008
Posts: 46
Location: Vilnius, Lithuania
|
| Posted: Thu Jan 17, 2008 11:13 am Post subject: svn branch for 5.0.4 ?<br /><a href="viewtopic |
|
|
Thanks, prasad.a
I made trunk, branches and tags directories in the svn repository. Later I created a branch called 5.0.3 and now I'm working in trunk (where 5.0.4 resides).
The question is: because I haven't completed 5.0.3 branch translation and now I'm translating trunk (5.0.4). When changes are made to 5.0.4 I would like them to appear in 5.0.3 branch. I guess I should merge. Is it difficult to do this? (I mean, the 5.0.4 and 5.0.3 files differ, and somewhere, a lot). I use Tortoise SVN and have never done this before. |
|
| Back to top |
|
prasad.a
Joined: 01 Aug 2007
Posts: 976
|
| Posted: Thu Jan 17, 2008 11:38 am Post subject: svn branch for 5.0.4 ?<br /><a href="viewtopic |
|
|
Hi vipart,
Language files for each vtigercrm version differs.
To keep it simple, you should always update 5.0.3 and 5.0.4 translations separately.
You can have two working copies of translation from your SVN. One checked out from 5.0.3 and other checked out from 5.0.4 branch.
When you make the changes, commit them to that branch. This way you don't loose any changes and keep your work simple.
You can try using: http://winmerge.org/
This tool lets you compare two directories, compare files etc... and can come in handy during merge operations.
Regards,
Prasad
vtiger Team |
|
| Back to top |
|
vipart
Joined: 11 Jan 2008
Posts: 46
Location: Vilnius, Lithuania
|
| Posted: Thu Jan 17, 2008 1:48 pm Post subject: svn branch for 5.0.4 ?<br /><a href="viewtopic |
|
|
| Ok, thanks |
|
| Back to top |
|
| |
