upgrading source code in local repository

Hi,

I'm using svn about one year now, but this issue is something that
keeps bothering me.

I'm working on a project with embedded devices running busybox.
As I'm making some changes to the busybox source code (tweaking some
hard coded parameters rather than changing actual code), I'm keeping
the busybox sources in my local svn repo.
I started off with busybox 1.16.1

Now I want to upgrade to the latest busybox 1.18.5
What I want to do is get the 1.18.5 code with the tweaks that I made to
the 1.16.1 code.

I can only think of the following way to do it:
1] diff original 1.16.1 code (without my changes) and new 1.18.5 code
2] patch my 1.16.1-tweaked working copy with the patch created above
3] solve any conflicts by hand
4] commit the new 1.18.5-tweaked code.

The problem with this, is that the second step can delete/create files
outside of svn (without using the "svn add"/"svn rm" commands).
Because a difference between the 1.16.1 and 1.18.5 version includes a
lot of file name changes (Kbuild and Config.in became Kbuild.src and
Config.src, these files exist in almost every dir), this leads to a lot
of manual fixing...

Would there be another way to upgrade the code to the new version?

(using svn 1.5.4)

Thanks,
Brecht
Received on 2011-07-29 15:47:55 CEST