KDE3.1 Feature: kcmfonts / kcmfontinst

[Thomas Zander]

On Wed, Jun 12, 2002 at 10:28:35AM +0100, Craig Drummond wrote:
> > So you don't want it on the webpage, you just want it in the release?
> 
> 
> How do I put it in the web-page?
> 

get the version from cvs
cvs co developer.kde.org/development-versions/
change the things you want.
sent the diff (cvs diff) to dirk.
Hope he likes it and commits.

Thats it :)

> > > Is there no way for me to just simply merge the changes from the "
> make_
> > > it_cool" branch into the main branch?
> > 
> > Not  commenting on the 'can I commit' issue; please be aware that you
> 
> > need to merge the branch, not just overwrite the HEAD from your local
> 
> > HD.
> >     cvs up -A
> >     cvs up -j make_it_cool
> > fix merge errors
> > make all install
> >     cvs commit
> > 
> > Hope I'm not pointing you to obvious things here, but better to say 
> too much
> > to make you aware of potention pittfalls :)
> 
> Fine - no problem. I'm pretty new to CVS - Waldo created the branch, 
> and I just thought it was about time it got merged into the main branch.
> But, as the code has been extensively changed, there will be *lots* of 
> merge errors. I'll look into this tonight...

You (plural) were warned that that would happen, thats the problem with branches
not used for bug-fixes only.

Anyway, I hope this will not be too big a problem.


-- 
Thomas Zander                                           zander at planescape.com
                                                 We are what we pretend to be
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 232 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20020612/3f3ff7e5/attachment.sig>