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.
(→From trunk to stable bug merges HOWTO) |
|||
| 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 | + | Teo has put some fixes into trunk, between revisions 4768 and 4782. |
| + | First we found out from log between which releases changes were actually made: | ||
| + | |||
| + | cd trunk | ||
| + | svn log | less | ||
| + | |||
| + | Second we review the changes made, so we can decide if it is right to put them into stable release: | ||
| + | |||
| + | svn diff https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4768 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782 | ||
* Check out branches/adempeire34 | * Check out branches/adempeire34 | ||
| − | * cd into | + | * cd into adempiere34 directory |
| − | + | ||
| + | Now its the time to merge above fixes into our local stable branch: | ||
| + | |||
| + | svn merge https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4768 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782 | ||
| + | |||
| + | Output of the command should be: | ||
| + | |||
| + | U client/src/org/compiere/grid/ed/VPAttribute.java | ||
| + | U client/src/org/compiere/grid/ed/VPAttributeDialog.java | ||
| + | |||
| + | Output of svn status should now include: | ||
| + | |||
| + | M client/src/org/compiere/grid/ed/VPAttribute.java | ||
| + | M client/src/org/compiere/grid/ed/VPAttributeDialog.java | ||
| + | |||
| + | And to chjeck if diff are OK v do | ||
| + | svn diff client/src/org/compiere/grid/ed/VPAttribute.java | ||
| + | svn diff client/src/org/compiere/grid/ed/VPAttributeDialog.java | ||
| + | |||
| + | When we are sure merges are OK (compile, eventualy test functionality) we can do commits: | ||
| + | |||
| + | svn commit client/src/org/compiere/grid/ed/VPAttribute.java | ||
| + | svn commit client/src/org/compiere/grid/ed/VPAttributeDialog.java | ||
| + | |||
| − | |||
---- | ---- | ||
Revision as of 07:12, 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 4768 and 4782.
First we found out from log between which releases changes were actually made:
cd trunk svn log | less
Second we review the changes made, so we can decide if it is right to put them into stable release:
svn diff https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4768 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782
- Check out branches/adempeire34
- cd into adempiere34 directory
Now its the time to merge above fixes into our local stable branch:
svn merge https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4768 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782
Output of the command should be:
U client/src/org/compiere/grid/ed/VPAttribute.java U client/src/org/compiere/grid/ed/VPAttributeDialog.java
Output of svn status should now include:
M client/src/org/compiere/grid/ed/VPAttribute.java M client/src/org/compiere/grid/ed/VPAttributeDialog.java
And to chjeck if diff are OK v do
svn diff client/src/org/compiere/grid/ed/VPAttribute.java svn diff client/src/org/compiere/grid/ed/VPAttributeDialog.java
When we are sure merges are OK (compile, eventualy test functionality) we can do commits:
svn commit client/src/org/compiere/grid/ed/VPAttribute.java svn commit client/src/org/compiere/grid/ed/VPAttributeDialog.java
