Cannot make two patches together (JBB's dbg and uncomment/comment)

[jbb]

On Mon, 15 Nov 1999, you wrote:
> Hi,
> 
> At first I sucessful patched KDevelop1.0-beta4.1 with John Birch's
> debugger code.
> Then I tried the comment/uncomment patch and it seemed it works but with
> some warnings. (!)
> After recompiling the whole KDevelop I saw the Debugger works but the
> comment/uncomment patch has failed. Anyhow there is no comment/uncomment
> feature in the IDE.
> 
> Any idea?

The warnings were clashes between the debugger patch and the comment/uncomment
patch. We're both trying to amend the same file(s).

You should have a/some .rej and .orig files. Use these to see what pieces of
code didn't get updated from the comment/uncomment patch, and patch them by
hand. Hopefully, we shouldn't be updating the exact same lines. (fingers
crossed).

> -- 
> 
> Ciao + Thanks in advance,
> --Falk
> 
> __________________________________________________
> Do You Yahoo!?
> Bid and sell for free at http://auctions.yahoo.com
-- 
Regards,

jbb
http://homepages.ihug.co.nz/~jbb