Difference between revisions of "Trunk bugfix merges from Adempiere34 stable branch"
From ADempiere
This Wiki is read-only for reference purposes to avoid broken links.
(→Bug Fix merges from Adempiere34 -> trunk) |
|||
| Line 24: | Line 24: | ||
==From trunk to stable bug merges HOWTO== | ==From trunk to stable bug merges HOWTO== | ||
We now have an example, how to make bug fix merge, if bug fix is made in trunk and we wont to merge it into stable release. | We now have an example, how to make bug fix merge, if bug fix is made in trunk and we wont to merge it into stable release. | ||
| + | Teo has put some fixes into trunk, between revisions 4770 and 4782. | ||
| + | |||
* Check out branches/adempeire34 | * Check out branches/adempeire34 | ||
| − | * | + | * cd into branch directory |
| + | * look at the changes | ||
| + | |||
| + | svn diff https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4770 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782 | ||
---- | ---- | ||
Revision as of 06:31, 26 February 2008
Bug Fix merges from Adempiere34 -> trunk
On this page we should describe which revisions we merged from Adempiere34 to trunk and other release branches.
| adempiere34 | trunk | |
|---|---|---|
| 4769 - branch created | branch split | |
| 4770 - prepare for 3.4.0 | do not apply | |
From trunk to stable bug merges HOWTO
We now have an example, how to make bug fix merge, if bug fix is made in trunk and we wont to merge it into stable release. Teo has put some fixes into trunk, between revisions 4770 and 4782.
- Check out branches/adempeire34
- cd into branch directory
- look at the changes
svn diff https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4770 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782
