[Lazarus] 0.9.30 merges are not really merged???

[Vincent Snijders]

2011/2/2 Graeme Geldenhuys <graemeg.lists at gmail.com>:
> Hi,
>
>
> Original bug report: http://bugs.freepascal.org/view.php?id=18401
> Original patch by Paul:  section of it shown below.
>
> The Wiki pages [http://wiki.freepascal.org/Lazarus_0.9.30_release_plan]
> shows than r28946 has been merged into 0.9.30 fixes branch. Well, I just
> got an update (fixes branch at r29327), and rebuild my IDE. The
> merge/fix is NOT in the fixes branch.
>
> I then browsed the SVN repository using my web browser, and viewed the
> file Paul amended [ide/infobuild.lfm]. Again, the last change to the
> infobuild.lfm file was back in r28810 (23 December 2010). Here is the
> direct link to that file's history:
>
> http://svn.freepascal.org/cgi-bin/viewvc.cgi/branches/fixes_0_9_30/ide/infobuild.lfm?root=lazarus&view=log
>

Thanks for verify the merge process. Apparently I marked it as merged,
but forgot to commit,  or I simply made a mistake. Maybe it was just
too late.

>
> So how do we know if all the other merges to 0.9.30 really are merged or
> not?
>

By checking them all. There are several ways to do this. This page may help:
http://svn2.freepascal.org/svn/logs/lazarus-fixes_0_9_30.log

The list of merged revision can be found in the svnmerge-integrated
property of root of the branch.
vincent at fpclin32:~/src/lazfixes$ svn propget svnmerge-integrated
http://svn.freepascal.org/svn/lazarus/branches/fixes_0_9_30
/trunk:1-28809,28812-28814,28816-28826,28828-28847,28853-28854,28861,28863-28875,28877,28905,28907,28910-28912,28923,28925-28927,28930,28935,28937,28941,28963-28964,28978-28980,28982,29005,29021,29025-29027,29031,29035-29036,29061-29062,29067,29081-29084,29094-29100,29104,29112,29136,29138,29140-29141,29146,29157,29159,29181,29192-29193,29237,29296,29299,29316

Revision is not mentioned, so it was not merged.

Another indicator may be the fixed in target version on the bug
report. From time to time I go over the log messages in
http://svn2.freepascal.org/svn/logs/lazarus-fixes_0_9_30.log and
update the issues mentioned in the log message.The issue had still had
fixed in version 0.9.31.

Again thank you for giving this feedback, it is valuable to get a good release.
Vincent