[GSoC] Merge branches (to all GSoC students)
twasilczyk at pidgin.im
Sat Sep 28 08:09:03 EDT 2013
this year's GSoC is over and all of you sent reports of the tasks
being successfully finished. Some of you claims about being ready to
merge. I'd like to draw your attention to some aspects of really being
ready to merge:
- Is your code building on win32? The current main branch does.
- Is your branch compiling without any warnings?
- Generally: don't break things. Are there any TODOs in your code that
removes some previously present functionality? Maybe something doesn't
work as previous, because there is some more work to be done?
- Have you tested your build under valgrind? You can use the following call:
$ valgrind --leak-check=no --suppressions=valgrind-suppressions pidgin
-d > pidgin.log 2>valgrind.log
- Please review all your changes carefully. The diff against main
branch would be helpful:
$ hg diff default > all-changes.diff
Yes, I know it's a ton of code. And a ton of potential bugs.
This year's projects are rather extensive and touches many parts of
the project. That means, they can interfere with each other. Have you
been thinking of the order of merges?
It's nice that all of you declared the wiliness to work on your
projects after the end of GSoC. However, don't rely on such desires
when planning of tasks needed for merge - student's duties on
university often make such plans failed. As an example, please look at
last year's statistics plugin GSoC project - it was "ready to merge",
but it isn't merged for the whole year.
This one applies especially for GObjectification project: if you don't
merge it now, you won't do it ever.
Please, don't make your projects failed just because you got other
commitments and you have no more time for finishing them.
More information about the Devel