Fóruns

Início » Liferay Portal » English » 3. Development

Visualização combinada Visão plana Exibição em árvore
Tópicos [ Anterior | Próximo ]
toggle
Davide N. P. Rossi
Trunk 6.1 - 6.2 confusion
23 de Janeiro de 2012 05:45
Resposta

Davide N. P. Rossi

Ranking: Junior Member

Mensagens: 55

Data de entrada: 3 de Julho de 2010

Mensagens recentes

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:

1ERROR [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???
Davide N. P. Rossi
RE: Trunk 6.1 - 6.2 confusion
23 de Janeiro de 2012 05:52
Resposta

Davide N. P. Rossi

Ranking: Junior Member

Mensagens: 55

Data de entrada: 3 de Julho de 2010

Mensagens recentes

OK - ill reply to myself - go get
svn.liferay.com/repos/public/portal/branches/6.1.x/
instead...
Gabriel Leon Leyva
RE: Trunk 6.1 - 6.2 confusion
10 de Fevereiro de 2012 07:53
Resposta

Gabriel Leon Leyva

Ranking: Regular Member

Mensagens: 239

Data de entrada: 20 de Junho de 2009

Mensagens recentes

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)
Mika Koivisto
RE: Trunk 6.1 - 6.2 confusion
13 de Fevereiro de 2012 16:24
Resposta

Mika Koivisto

LIFERAY STAFF

Ranking: Liferay Legend

Mensagens: 1499

Data de entrada: 7 de Agosto de 2006

Mensagens recentes

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.
Hitoshi Ozawa
RE: Trunk 6.1 - 6.2 confusion
13 de Fevereiro de 2012 17:46
Resposta

Hitoshi Ozawa

Ranking: Liferay Legend

Mensagens: 7990

Data de entrada: 23 de Março de 2010

Mensagens recentes

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.