Difference between revisions of "Trunk bugfix merges from Adempiere34 stable branch"
(→Bug Fix merges from Adempiere34 -> trunk) |
|||
(9 intermediate revisions by 2 users not shown) | |||
Line 6: | Line 6: | ||
! adempiere34 | ! adempiere34 | ||
! trunk | ! trunk | ||
− | ! | + | ! description |
|- | |- | ||
|4769 - branch created | |4769 - branch created | ||
Line 16: | Line 16: | ||
| | | | ||
|- | |- | ||
− | |4783 - merge from trunk | + | |4783 - merge BF from trunk |
− | |bug fix : | + | | do not apply |
− | + | |<=bug fix from trunk -r 4768:4782 | |
|- | |- | ||
+ | |4795 - merge BF from trunk | ||
+ | | do not apply | ||
+ | |<=bug fix from trunk -r 4783:4794 | ||
+ | |- | ||
+ | |4820 - merge BF from trunk | ||
+ | | do not apply | ||
+ | |<=bug fix from trunk -r 4804:4813 | ||
|} | |} | ||
Line 35: | Line 42: | ||
svn diff https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4768 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782 | svn diff https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4768 https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@4782 | ||
− | * Check out branches/ | + | * Check out branches/adempiere34 |
* cd into adempiere34 directory | * cd into adempiere34 directory | ||
Line 47: | Line 54: | ||
U client/src/org/compiere/grid/ed/VPAttributeDialog.java | U client/src/org/compiere/grid/ed/VPAttributeDialog.java | ||
− | Output of svn status should now | + | Output of svn status should now includes: |
M client/src/org/compiere/grid/ed/VPAttribute.java | M client/src/org/compiere/grid/ed/VPAttribute.java | ||
M client/src/org/compiere/grid/ed/VPAttributeDialog.java | M client/src/org/compiere/grid/ed/VPAttributeDialog.java | ||
− | And to | + | And to check if diff are OK you can do : |
svn diff client/src/org/compiere/grid/ed/VPAttribute.java | svn diff client/src/org/compiere/grid/ed/VPAttribute.java | ||
svn diff client/src/org/compiere/grid/ed/VPAttributeDialog.java | svn diff client/src/org/compiere/grid/ed/VPAttributeDialog.java |
Latest revision as of 03:17, 5 March 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 | description |
---|---|---|
4769 - branch created | branch split | |
4770 - prepare for 3.4.0 | do not apply | |
4783 - merge BF from trunk | do not apply | <=bug fix from trunk -r 4768:4782 |
4795 - merge BF from trunk | do not apply | <=bug fix from trunk -r 4783:4794 |
4820 - merge BF from trunk | do not apply | <=bug fix from trunk -r 4804:4813 |
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/adempiere34
- 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 includes:
M client/src/org/compiere/grid/ed/VPAttribute.java M client/src/org/compiere/grid/ed/VPAttributeDialog.java
And to check if diff are OK you can 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 client/src/org/compiere/grid/ed/VPAttributeDialog.java