Difference between revisions of "Lazarus 1.0 fixes branch"
Line 39: | Line 39: | ||
*r36570 lazbuild: select IDE build mode, fixed compiling with different mode | *r36570 lazbuild: select IDE build mode, fixed compiling with different mode | ||
*r36572 LCL: set csCaptureMouse on TToolButton, but don't send click if mouse is out of ttoolbutton on mouseup.issues #19688,#21560 | *r36572 LCL: set csCaptureMouse on TToolButton, but don't send click if mouse is out of ttoolbutton on mouseup.issues #19688,#21560 | ||
+ | *r36574 IDE: fixed saving environment on every change | ||
==== Submitted by others ==== | ==== Submitted by others ==== |
Revision as of 11:31, 5 April 2012
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
- r36528 SynEdit: Template(Syncro) fix invalidation
- r36529, r36547 IDE: Printing: break long lines. Issue 0013479
- IDE: Printing: break long lines. Fix Utf8. Update for rev 36529
- r36531 LazReport: fixed buttonpanel localization in BarCode editor dialog
- r36533 IDE: clean up of unused resourcestrings
- r36535 IDE: more clean up of unused resourcestrings
- r36537 Documents LCLIntf.GetDeviceCaps
- r36538 IDE: always store lazarus directory
- r36539 LazReport: uppercase variable before comparing with hardcoded functions. Properly fix to 21624
- r36543 IDE: setup dialog: using same file resolving as IDE
- r36546 IDE: consider empty lazarusdirectory as pcp, empty fpcsrcdir as lazdir, empty testdir as lazdir
- r36548 IDE: fixed note about wrong laz dir
- r36549 IDE: fixed crash on find identifier references
- r36551 IDE: translate descriptions of all macros
- r36552 IDE: fixed editor tab position combobox items localization on Editor/Misc options page
- r36556 IDE: warn if upgrading configs
- r36557 IDE: clean up of 36556
- r36565 LCL: Prevent TShape.stRectangle disappearing with certain Height/Width and Pen.Width values.
- 36561, 36562, 36563, r36566: Improve Options/Keymap
- r36567 IDE: show downgrade warning
- r36568 IDE: clean up
- r36569 IDE: clean up
- r36570 lazbuild: select IDE build mode, fixed compiling with different mode
- r36572 LCL: set csCaptureMouse on TToolButton, but don't send click if mouse is out of ttoolbutton on mouseup.issues #19688,#21560
- r36574 IDE: fixed saving environment on every change
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: 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
Merging revisions from trunk
To merge one or more revisions from trunk, use the svn merge command. For example to merge revision 36506 and 36510 use:
svn merge -c 36506,36510 ^/trunk
To generate a commit log message, use:
svn log ^/trunk -c 36506,36510 > svnmerge-commit-message.txt
Edit svnmerge-commit-message.txt with your favorite text editor and add a first line like:
Merged revision 36506,36510 from /trunk.
Commit this with:
svn commit -F svnmerge-commit-message.txt
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
Then you can create a log message with:
svn log ^/trunk -c 36507 > svnmerge-commit-message.txt
Edit svnmerge-commit-message.txt with your favorite text editor and add first line like:
Blocked revision 36507 from /trunk
Then commit this change:
svn commit -F svnmerge-commit-message.txt