Hello Marko, thanks for your help: I would like to merge locator with the city-region-branch. Using your steps, I see, that Steve made the branch from 1979, or?! r1980 | steve | 2011-07-01 15:30:57 +0200 (Fre, 01. Jul 2011) | 2 Zeilen Create branch for city/region problem fix So, now, that I know how I can download different versions (tried 1973 and 1979), I tried to make a patch with diff -r -u mkgmap-city newtrunk > patch1 When I try to patch the locator with this patch I get a lot of errors: Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file all-wcprops.rej ... So any idea what's wrong?! Cheers, Martin Am 2011-07-08 14:02, schrieb Marko Mäkelä:
On Fri, Jul 08, 2011 at 01:42:13PM +0200, Martin wrote:
I also didn't know how to patch this both files and apply this patch to the locator branch. Here is how it should work:
svn co http://svn.parabola.me.uk/mkgmap/branches/locator mkgmap-locator cd mkgmap-locator svn log|less # see which trunk revision it is based on # The log reports for me that the svn:log of the current head (r1977) is # "Synchronize to trunk r1973". So, you will need to merge changes from # that on: svn merge http://svn.parabola.me.uk/mkgmap/trunk -r1973:HEAD . # This went without conflicts. ant dist # This gives compilation failures: "cannot find class BlockInputStream"
So, it does not seem to be that simple.
Best regards,
Marko _______________________________________________ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev