wrote:
Hi, This patch start to separate the interfaces
in
wine3d3. Complete separation requires
queryInterface
support which I'll send through soon, this
patch
has
no dependencies but provides the final
interface
needed by later revisions.
Hi Oliver,
this patch couldn't be applied cleanly to CVS.
Just
to let you know, I didn't check further.
I'm wondering if AJ will have many comments on
the
patches. I hope not as your work is going to make a lot of people
happy.
It's a diff against CVS. But I think you need a diff against CVS + your previous patch. Or am I missing something ?
The patches aren't incremental, that way one can fail but it shouldn't affect the rest being merged. I have another couple of discrete patches to send in then the patches become dependant on some of the interface changes, but hopefully not the underlying functionality changes.
I also don't have enough HDD space to keep incremental versions and check that they compile/work especially with all the interface/include changes.
If anyone knows of a good tool for managing patches let me know (not cerversa!), there's a surprising lack of tools available.
at the moment I'm using the following...
#!/bin/bash
#given a file, replace the first path with a new path #diff the two files
stripedpath=$(echo $1 | grep -o "/.*") kdiff3 $1 "$2/$stripedpath"& kwrite $1 & kwrite "$2/$stripedpath"&
-- diffdueo clean/wine/.... working
Very 21st century.
A tool for merging would be good too, e.g. merge patch1.patch patch2.patch > patch_merged.patch.
if one doesn't exist I'll write it and put it on my site.
Send instant messages to your online friends http://uk.messenger.yahoo.com
On Tue, 01 Mar 2005 18:01:54 +0000, Oliver Stieber wrote:
if one doesn't exist I'll write it and put it on my site.
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
Obviously this is a very simple usage of the tool, but more advanced work requires me to finish setting up the gateway.
thanks -mike
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:
- Install SVK
- 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
- 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 though.
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
On Tue, 01 Mar 2005 19:15:38 +0000, Oliver Stieber wrote:
I'll give it another go, svk doesn't seem too happy though.
What went wrong last time?
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.
I'm not sure what you mean by edit and merge at the same time ...
thanks -mike
--- Mike Hearn mike@navi.cx wrote:
On Tue, 01 Mar 2005 19:15:38 +0000, Oliver Stieber wrote:
I'll give it another go, svk doesn't seem too
happy
though.
What went wrong last time?
CVS integration wasn't working properly, and I keep getting errors like no depot spec at /usr/lib/perl5/vendor_perl/5.8.5/SVK/XD.pm line 280.
Though I'm sure I setup svk.
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.
I'm not sure what you mean by edit and merge at the same time ...
Well, in kdiff I can view the differences between two documents a and b , and merge/copy across the changes a, b or a and b.
But where there are a lot of changes between a and b and you want to break up b into smaller mutually exclusive patches this isn't good enough, some times diff produces an almost useless diff (i.e. changes accrue in similar but different places) and I usually want to copy from b to a but with edithttp://svk.elixus.org/?MikeHearns.
Hence viewing the merge and having two copies of kwrite open at the same time with the documents I want to merge.
thanks -mike
Send instant messages to your online friends http://uk.messenger.yahoo.com
On Tue, 01 Mar 2005 20:08:23 +0000, Oliver Stieber wrote:
CVS integration wasn't working properly, and I keep getting errors like no depot spec at /usr/lib/perl5/vendor_perl/5.8.5/SVK/XD.pm line 280.
Yes, don't try and branch from CVS directly. It supports that but there are some bugs that need to be fixed first. Instead, just maintain a CVS checkout inside SVK with all the CVS control files as well. That's what I do and it works OK, you can do a "cvs diff" to get a patch relative to HEAD and an "svk diff" to get a patch relative to whatever you last committted.
Long term a gateway is needed because it makes merging patches from HQ into your tree without having to commit your own work much simpler. Also parsing the Wine CVS repo takes ages because it's so huge.
Well, in kdiff I can view the differences between two documents a and b , and merge/copy across the changes a, b or a and b.
But where there are a lot of changes between a and b and you want to break up b into smaller mutually exclusive patches this isn't good enough, some times diff produces an almost useless diff (i.e. changes accrue in similar but different places) and I usually want to copy from b to a but with edithttp://svk.elixus.org/?MikeHearns.
Hence viewing the merge and having two copies of kwrite open at the same time with the documents I want to merge.
Maybe you should check out emacs, it has some pretty powerful interactive merge abilities that let you select particular chunks to apply, shows you the exact parts that changed and you can edit the document at the same time.
Maybe you should check out emacs, it has some pretty powerful interactive merge abilities that let you select particular chunks to apply, shows you the exact parts that changed and you can edit the document at the same time.
It's not that long since I bothered to learning more than the basics in vi, mainly because sun install vi not vim and the arrow keys didn't work, so it seemed like a good time to vimtutor and read the manual.
Sounds good, but I think I'll spend the time it takes to learn a new tool fixing the KDE one instead. (and then maybe learn emacs)
Send instant messages to your online friends http://uk.messenger.yahoo.com
-
Mike Hearn -
Oliver Stieber