subversion problem

[Hartmut Birr]

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

[Casper Hornstrup]

>   -----Original Message-----
>  From: ros-dev-bounces(a)reactos.com 
>  [mailto:[e-mail]] On Behalf Of Hartmut Birr
>  Sent: 26. februar 2005 00:36
>  To: ReactOS Development List
>  Subject: [ros-dev] subversion problem
>  
>  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? 
I've run into this problem before. What is needed to correct it
is to svn delete winebuild on the branch and svn copy it again
from trunk to the branch. It happens because we've replaced
winebuild in trunk after the branch was created so the two
objects have no common history.

I'd recommend the order:

1) svn delete winebuild on branch
2) svn copy winebuild from trunk to branch
3) Create a working copy of the branch
4) Move the winebuild directory in the working copy out of the working copy
5) Merge changes on trunk to working copy
6) Move the winebuild directory into the working copy again
7) Fix possible merge conflicts, test and commit

Casper