There is no need to keep the bootstrap branch in sync with the trunk.
The branch is intended to be a sandbox for visual theme development.
Visual themes are not influenced by most of the work going on in the trunk.
Once the related Jira issue is completed, then we can merge the branch
to the trunk.
The last time I checked, there were still a lot of problems with the
boostrap theme, so it is not ready for merging.
Adrian Crum
Sandglass Software
www.sandglass-software.com
On 5/19/2015 12:51 AM, Pierre Smits wrote:
There are significant changes in the bootstrap dev branch regarding
widgets, that aren't reflected in trunk. I tried the bootstrap theme in my
dev for trunk and it gave errors.
It seems to me that best would be to bring bootstrap dev in sync with
branch, fix the issues registered and then, when there is consensus, port
back to trunk.
Best regards,
Pierre Smits
*ORRTIZ.COM <http://www.orrtiz.com>*
Services & Solutions for Cloud-
Based Manufacturing, Professional
Services and Retail & Trade
http://www.orrtiz.com
On Tue, May 19, 2015 at 9:30 AM, Julien NICOLAS <julien.nico...@nomaka.fr>
wrote:
What could be the best way to keep this work alive ?
I propose to make diff between bootstrap branch and trunk and make a patch
with bootstrap theme and GUI modifications.
It's a manual merge but it could work ;)
What do you think ?
Julien.
Le 18/05/2015 13:05, Jacques Le Roux a écrit :
I tried but got this
Command: Auto-merge https://svn.apache.org/repos/asf/ofbiz/trunk into
C:\projectsASF\boostrap_theme
Error: Reintegrate can only be used if revisions 1634810 through 1679986
were
Error: previously merged from
Error: https://svn.apache.org/repos/asf/ofbiz/branches/boostrap_theme to
the
Error: reintegrate source, but this is not the case:
Error: ofbiz/trunk
Error: Missing ranges:
/ofbiz/branches/boostrap_theme:1634810,1635414,1635439
Gave up
Jacques
Le 18/05/2015 12:39, Pierre Smits a écrit :
Hi all,
Can we have an update on the bootstrap dev branch so that it has the
latest
from trunk?
Best regards,
Pierre Smits
*ORRTIZ.COM <http://www.orrtiz.com>*
Services & Solutions for Cloud-
Based Manufacturing, Professional
Services and Retail & Trade
http://www.orrtiz.com
