looks good. I'll go forward with this right now.
regards, Martin On 5/29/06, Bernd Bohmann <[EMAIL PROTECTED]> wrote:
Hello, I think the externals cause the trouble. Try a 'svn pg svn:externals' in the jsf12tc6 dir: core https://svn.apache.org/repos/asf/myfaces/core/trunk maven https://svn.apache.org/repos/asf/myfaces/maven/trunk site https://svn.apache.org/repos/asf/myfaces/site/trunk tomahawk https://svn.apache.org/repos/asf/myfaces/tomahawk/trunk shared https://svn.apache.org/repos/asf/myfaces/shared/trunk tobago https://svn.apache.org/repos/asf/myfaces/tobago/trunk the externals points to trunk. I suggest create a branch of core with: svn copy https://svn.apache.org/repos/asf/mafaces/core/trunk https://svn.apache.org/repos/asf/mafaces/core/branches/jsf12 Then rollback the changes on trunk like wendy suggested svn merge -r 410016:410016 https://svn.apache.com/repos/asf/myfaces/core/trunk delete the jsf12tc6 dir svn delete https://svn.apache.org/repos/asf/myfaces/jsf12tc6 Can someone verify the suggested steps? I don't think we should create two different branches for jsf12. Why we don't add all tomcat 5.5 and jdk 1.4 or jdk 1.3 compatible changes to tomahawk? Regards Bernd Wendy Smoak schrieb: > On 5/29/06, Matthias Wessendorf <[EMAIL PROTECTED]> wrote: > >> any ideas? > > Since Stan's were the last changes on the trunk, you can delete > myfaces/jsf12tc6 and then copy from myfaces/core/trunk to > myfaces/jsf12tc6. > > Then restore core/trunk from r410016 (prior to Stan's changes). > Either merge the changes in reverse, or else delete core/trunk and > copy it back from r410016, as shown in Resurrecting Deleted Items [1]. > It depends on whether you want to keep the history on the JSF 1.2 > changes in core/trunk. (I assume not.) > > [1] http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2 > -- Dipl.-Ing. Bernd Bohmann - Atanion GmbH - Software Development Bismarckstr. 13, 26122 Oldenburg, http://www.atanion.com phone: +49 441 4082312, mobile: +49 173 8839471, fax: +49 441 4082333
-- http://www.irian.at Your JSF powerhouse - JSF Consulting, Development and Courses in English and German Professional Support for Apache MyFaces
