Chris Cannam wrote:
On Thursday 23 Feb 2006 14:26, Chris Cannam wrote:
But I think we _should_ merge the guitar branch first.
OK, about this merge. The guitar branch has a whole load of things like
indentation and bracketing changes all over the place, which I'm trying to
avoid merging across (where they're in my code I don't want the changes, and
they might hide problems e.g. if the code has had bug fixes in HEAD since it
was frigged about with in the guitar branch).
I think cvs can be told to ignore whitespace-only changes in
updates/merges. Otherwise, even though it's a chore, we could re-indent
the relevant files if needed. If we split the task between us too it
shouldn't take too long with XEmacs.
However, it also appears to contain fixes to the KDE deprecation warnings for
KIO::Netaccess::download etc. I think we should merge these now. What d'you
think?
These should certainly go in but I'd rather do the merge in one pass, if
only to make things clearer in cvs history. I have no idea how a partial
merge would look (especially when converted to svn).
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
