Forums

Home » Liferay Portal » English » 3. Development

Combination View Flat View Tree View
Threads [ Previous | Next ]
toggle
Davide N. P. Rossi
Trunk 6.1 - 6.2 confusion
January 23, 2012 5:45 AM
Answer

Davide N. P. Rossi

Rank: Junior Member

Posts: 55

Join Date: July 3, 2010

Recent Posts

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
January 23, 2012 5:52 AM
Answer

Davide N. P. Rossi

Rank: Junior Member

Posts: 55

Join Date: July 3, 2010

Recent Posts

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
February 10, 2012 7:53 AM
Answer

Gabriel Leon Leyva

Rank: Regular Member

Posts: 241

Join Date: June 20, 2009

Recent Posts

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
February 13, 2012 4:24 PM
Answer

Mika Koivisto

LIFERAY STAFF

Rank: Liferay Legend

Posts: 1501

Join Date: August 7, 2006

Recent Posts

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
February 13, 2012 5:46 PM
Answer

Hitoshi Ozawa

Rank: Liferay Legend

Posts: 7954

Join Date: March 23, 2010

Recent Posts

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.