Foren

Home » Liferay Portal » English » 3. Development

Kombinierte Ansicht Flache Ansicht Baumansicht
Threads [ Zurück | Nächste ]
toggle
Davide N. P. Rossi
Trunk 6.1 - 6.2 confusion
23. Januar 2012 05:45
Antwort

Davide N. P. Rossi

Rang: Junior Member

Nachrichten: 55

Eintrittsdatum: 3. Juli 2010

Neue Beiträge

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. Januar 2012 05:52
Antwort

Davide N. P. Rossi

Rang: Junior Member

Nachrichten: 55

Eintrittsdatum: 3. Juli 2010

Neue Beiträge

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. Februar 2012 07:53
Antwort

Gabriel Leon Leyva

Rang: Regular Member

Nachrichten: 241

Eintrittsdatum: 20. Juni 2009

Neue Beiträge

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. Februar 2012 16:24
Antwort

Mika Koivisto

LIFERAY STAFF

Rang: Liferay Legend

Nachrichten: 1501

Eintrittsdatum: 7. August 2006

Neue Beiträge

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. Februar 2012 17:46
Antwort

Hitoshi Ozawa

Rang: Liferay Legend

Nachrichten: 7954

Eintrittsdatum: 23. März 2010

Neue Beiträge

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.