[wined3d] texture interface separation.

Oliver Stieber oliver_stieber at yahoo.co.uk
Tue Mar 1 13:15:38 CST 2005

> It does exist, SVK can do that and I've been using
> it to manage
> incremental diffs with the DCOM stuff. Only issue is
> that it needs to be
> set up first.
> Basically:
> 1) Install SVK
> 2) Do an "svk import" of the clean WineHQ source
> tree
> 3) Build it
> 4) Apply your first patch, check it builds, "svk
> diff >mypatch", submit
> 5) svk commit
> 6) Apply your second patch, check it builds, "svk
> diff >mypatch", submit
> 7) svk commit .... etc etc
> 8) You can now access any patch relative to the
> previous one with
>    svk diff -r4:5, eg to see the differences between
> revisions 4 and 5
I'll give it another go, svk doesn't seem too happy

I've had a look around and still can't find a simple
merge tool, or a simple tool that lets me edit and
merge at the same time.

kdiff3 doesn't let me edit, meld is a bit better but
doesn't support editing + merging concurrently.

> thanks -mike

Send instant messages to your online friends http://uk.messenger.yahoo.com 

More information about the wine-devel mailing list