Hi,
I would update the cache_manager_rewrite branch with all changes from the main tree. I'm using the merge command to add the changes to my local tree. It fails allways with revision 13667. I can merge all changes up to revision 13666. But I get an error with revision 13667:
E:\Sandbox\ros_cache\reactos\tools>d:\programme\subversion\bin\svn.exe merge -r13566:13667 svn://svn.reactos.com/trunk/reactos/tools D winebuild\res32.c D winebuild\spec32.c D winebuild\res16.c D winebuild\utils.c D winebuild\Makefile.in D winebuild\spec16.c D winebuild\mkstemps.c D winebuild\build.h D winebuild\import.c D winebuild\relay.c D winebuild\winehq2ros.patch D winebuild\winglue.h D winebuild\winebuild.man.in D winebuild\main.c D winebuild\parser.c D winebuild\Makefile D winebuild svn: Revision 13667 doesn't match existing revision 13567 in 'winebuild'
What can I do to solve this problem?
- Hartmut