Lazarus 1.0 fixes branch
This page contains the revisions to be merged from trunk to the Lazarus 1.0 fixes branch.
Release notes can be found here Release notes
Fixes for 1.0.0
Merge requests
Submitted by developer / committer
- r36506 LazReport, fix barcode dialog localization (Jesus)
r36508 Updated Japanese translation- r36509 Window Column, store pointer to resourcestring
- r36510 LazReport, fix barcode addin when TfrBarCodeObject is not yet instantiated (in this case barcode editor defaults to memo view.
- r36511 DividerBevel: implemented Transparent.
- r36514 IDE: moved macros save/saveall to source editor
- r36515 IDE: update macro descriptions after translating resource strings
- r36516 IDE: trim TLazPackageGraph.GetFallbackOutputDir
- r36517 IDE: check if package needs rebuild: switch to fall back directory: update compiler params
- r36518 IDE: install/uninstall package dialog: fixed icons, added info about current state
Submitted by others
Merged
Submitted by developer / committer
r36508 Updated Japanese translation
Submitted by others
How to merge
The lazarus developers have decided to use the native svn merge for this branch. Other branches used the svnmerge.py script to manage the revisions to be merged.
- TODO: write down how to merge a set of revisions
Maybe this information should be put in a separate page.
SVN_Migration#Merge_with_plain_svn
Using TortoiseSVN
As noted in the link above using TortoiseSVN is more or less self explaining.
- TODO: add some screen shots.
When committing, in the recent messages a nice commit message is available.
Tested with TortoiseSVN 1.7.6, SVN 1.7.4.
Show list of revision that can be merged
In the lazarus fixes_1_0 directory do:
svn mergeinfo ^/trunk --show-revs eligible
Show list of revision that have been merged
In the lazarus fixes_1_0 directory do:
svn mergeinfo ^/trunk --show-revs merged
Blocking a revision to be merged
Sometimes you want to block a revision to be merged, i.e. you want to make sure that this revision is never merged to the fixes branch, for example, because it contains a new feature or it contains a version number change not applicable to the fixes branch, but only to trunk. To block revision 36507, use:
svn merge -c 36507 --record-only ^/trunk