[josm-dev] Best use of SVN and Local Repository

[Karl Newman]

On Mon, Jun 9, 2008 at 3:57 AM, Stuart <stuart.srsm at blueyonder.co.uk> wrote:

> Hi,
>
> I'm looking for advice on how to keep my local JOSM Repository up to date
> while developing my own little projects.
>
> E.g. I created JOSMRepository and imported the josm trunc files into it in
> March. Since then I've updated 5 files with some minor modifications (just
> playing around nothing useful for the JOSM project). I would now like to
> update my repository with the latest josm files but need to do this in a
> sensible way such that my updated files will be highlighted as requiring
> Merge or similar. I suspect there are many ways to do this including brute
> force (Update Repository from josm trunk / Check out files to working folder
> / by hand sort out my files from either previous revisions or a copied
> folder) but this lacks elegance and needs me to keep a list of the files
> etc. I need a proper process (easy with 5 files but error prone with lots).
>
> Ideally, there would be some mechanism whereby the Update into my local
> repository would automatically detect any files that I've subsequently
> Checked In (perhaps by date that I enter somewhere) and allow me to Merge my
> changes into the Updated code. Or I Update the local repository (overwriting
> my changes) and then do a Merge from my Working Copy folder of the entire
> project such that SVN is clever enough to simply Check Out the JOSM updated
> files (since March) and highlight the conflicts due to the changes I have
> made to enable me to do the Merge on those few files I've modified.
> Hopefully all in a manner where the History of my changes is maintained.
>
> I'm using Netbeans with SVN built in and TortoiseSVN. Not quite up to speed
> on all SVN lingo/concepts so need a bit of hand holding. I suspect most
> developers have this issue but haven't found any pointers on nabble etc.
>
>
> Cheers
>
> Stuart
>

This section of the Subversion book should help you:
http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html

Basically you want to set up a branch in your local repository with
svn:externals ( http://svnbook.red-bean.com/en/1.0/ch07s03.html ) to point
to the JOSM repository, then do your own local hacking in your repository
and update and merge as needed. Subversion does a lot of the hard work for
you--in most cases you don't have to manually merge anything, and when you
do, it's usually just the parts where your local changes conflict with
upstream changes. It's really quite painless.

Karl