The UUID to r2.5x merge has been redone, following this procedure:
* Merge UUID into UUID-2pk.
* Reintegrate UUID-2pk into UUID.
* Revert the r2.5x to r6310, the revision previous to the first UUID
merge.
* Merge r2.5x into UUID.
* Merge UUID into r2.5x using the classic 2 URL syntax. This done the
same as reintegrate [1], without some extra checks. It was not
possible to use reintegrate.
So now the r2.5x should be in good state. We'll wait till the
attachmenticon and eliminate_popup_frames are merged into r2.5x, before
merging it back to trunk.
Please keep your r2.5x synced. Merge often.
Juan Pablo
[1] http://blogs.open.collab.net/svn/2008/07/subversion-merg.html
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Openbravo-development mailing list
Openbravo-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-development
