Hi Yves,
Why don't you ask for an svn account (see
http://wiki.openstreetmap.org/wiki/Accounts#SVN_access_.28OSM_software.29). You
can then commit your valuable changes directly to the repository.
Greetz,
Richard
> Date: Fri, 9 Jan 2009 18:50:00 +0100
> From: [email protected]
> To: [email protected]
> CC: [email protected]
> Subject: Re: [Merkaartor] Patch: Style: Icon path relative to style file
>
> On 09.01.2009 17:51 CE(S)T, Chris Browet wrote:
> > SVN is the subversion command-line. "svn diff" is a command which create
> > a "unified diff" file containg all the differences between your working
> > copy and the repository.
> > I don't know which tool you use to checkout your copy of Merkaartor but
> > it surely include such a functionality.
>
> Okay, last time I checked it didn't understand my request. Now I took a
> closer look and it seems to support the diff command. The problem is
> that I've made changes to the files from different things. When I make a
> diff, I always check with my file comparison tool (Beyond Compare) first
> and eliminate any differences that belong to other tasks. (I have a
> backup of my full edited file to revert it after making the diff.) Then
> I only have the changes of this task and I can use diff.exe (plain win32
> port of Unix' diff command). That's run with -Naru, so it's a unified
> diff. Just for each file. I have no problem to concatenate (Unix' cat)
> the resulting files into a single file, if that's what you mean. Since
> I'm doing progressive changes to the Merkaartor source code, I'm
> creating diff files manually anyway. But my tools let me do it quite
> efficiently.
>
> > With TortoiseSVN, it is "Create Patch..."
>
> I'm not using TortoiseSVN unless I need to. It's DLL messed up my system
> once. SVN's win32 binaries work well enough to checkout code. Just like
> they do in a Linux shell.
>
> > Otherwise, you could also do a "diff -u" between your woking copy and a
> > fresh checkout of the repository
>
> That's what I do (for each file belonging to the change).
>
> > It is just painful to patch files 1 by 1.
>
> I understand, and it's not my intention to burden you with unnecessary
> management work.
>
> --
> Yves Goergen "LonelyPixel" <[email protected]>
> Visit my web laboratory at http://beta.unclassified.de
>
> _______________________________________________
> Merkaartor mailing list
> [email protected]
> http://lists.openstreetmap.org/listinfo/merkaartor
_________________________________________________________________
Windows Live™: Keep your life in sync.
http://windowslive.com/explore?ocid=TXT_TAGLM_WL_t1_allup_explore_012009
_______________________________________________
Merkaartor mailing list
[email protected]
http://lists.openstreetmap.org/listinfo/merkaartor
