Foros de discusión

  1. Inicio
  2. Development
  3. Trunk 6.1 - 6.2 confusion

Trunk 6.1 - 6.2 confusion

thumbnail
Davide Rossi, modificado hace 12 años.

Trunk 6.1 - 6.2 confusion

Junior Member Mensajes: 55 Fecha de incorporación: 3/07/10 Mensajes recientes
Hi to all, I am having some trouble understanding trunk versions and need help....

At the moment the current downloadable liferay CE version is 6.1 GA1 and trunk is set to liferay version 6.2. I imagine though that there will be 6.1.1 ga2, ga3 etc... in between the two versions as previously with 6.0 versions.
I am having issues downloading trunk and making changes (fix issues or create, change themes) to 6.1 version for, lets say, next ga2 which is still version 6.1 because trunk is now 6.2 and therefore am requested by liferay install to change version in all personalised themes or else get:

ERROR [ThemeLocalServiceImpl:488] Themes in this WAR are not compatible with Liferay Portal Community Edition / 6.2.0


and no deployed theme.


This is quite annoying. Because I also have to change them back to liferay 6.1 to get them to work on, the current version.

Should not trunk be still 6.1 version???
thumbnail
Davide Rossi, modificado hace 12 años.

RE: Trunk 6.1 - 6.2 confusion (Respuesta)

Junior Member Mensajes: 55 Fecha de incorporación: 3/07/10 Mensajes recientes
OK - ill reply to myself - go get
svn.liferay.com/repos/public/portal/branches/6.1.x/
instead...
thumbnail
Gabriel Leon Leyva, modificado hace 12 años.

RE: Trunk 6.1 - 6.2 confusion

Regular Member Mensajes: 243 Fecha de incorporación: 20/06/09 Mensajes recientes
It has not been any changes in the branch


URL: http://svn.liferay.com/repos/public/portal/branches/6.1.x
Repository Root: http://svn.liferay.com/repos/public
Repository UUID: 05bdf26c-840f-0410-9ced-eb539d925f36
Revision: 100315
Node Kind: directory
Schedule: normal
Last Changed Author: brian.chan
Last Changed Rev: 99644
Last Changed Date: 2012-02-03 01:06:35 -0700 (Fri, 03 Feb 2012)
thumbnail
Mika Koivisto, modificado hace 12 años.

RE: Trunk 6.1 - 6.2 confusion

Liferay Legend Mensajes: 1519 Fecha de incorporación: 7/08/06 Mensajes recientes
Trunk contains the next development version which currently is 6.2. All fixes to 6.1 will go to trunk and will be picked to 6.1 branch on individual issue basis.
thumbnail
Hitoshi Ozawa, modificado hace 12 años.

RE: Trunk 6.1 - 6.2 confusion

Liferay Legend Mensajes: 7942 Fecha de incorporación: 24/03/10 Mensajes recientes
svn trunk is like a nightly build and is unstable. It's may contain some bug fixes but it also may contain some other modifications as well.
That is, you should just pick up files from svn trunk to integrate with 6.1.0GA1. The problem is how you're merging your codes.