[Merkaartor] Patch: Style: Icon path relative to style file

[Chris Browet]

>
>
> 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.
>

I understand your concern. "CAT"-ing diff files should work, too.

>
> > 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).
>

What I meant, is that doing the diff at directory level generates only 1
file. But, as I said, doing a cat on your various diff is ok.

- Chris -
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/merkaartor/attachments/20090110/5459985b/attachment.html>