Author: jleroux
Date: Sun Apr 17 10:27:34 2016 New Revision: 1739572 URL: http://svn.apache.org/viewvc?rev=1739572&view=rev Log: "Applied fix from trunk for revision: 1739571 " ------------------------------------------------------------------------ r1739571 | jleroux | 2016-04-17 12:26:54 +0200 (dim. 17 avr. 2016) | 1 ligne Sometimes you need to update before testing or reverting ------------------------------------------------------------------------ Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/tools/revert.bat ofbiz/branches/release15.12/tools/test.bat Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Apr 17 10:27:34 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730320,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730320,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571 Modified: ofbiz/branches/release15.12/tools/revert.bat URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/tools/revert.bat?rev=1739572&r1=1739571&r2=1739572&view=diff ============================================================================== --- ofbiz/branches/release15.12/tools/revert.bat (original) +++ ofbiz/branches/release15.12/tools/revert.bat Sun Apr 17 10:27:34 2016 @@ -20,4 +20,4 @@ rem #################################### rem to revert back a revision in local copy. echo on -svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/trunk +svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/trunk Modified: ofbiz/branches/release15.12/tools/test.bat URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/tools/test.bat?rev=1739572&r1=1739571&r2=1739572&view=diff ============================================================================== --- ofbiz/branches/release15.12/tools/test.bat (original) +++ ofbiz/branches/release15.12/tools/test.bat Sun Apr 17 10:27:34 2016 @@ -24,4 +24,4 @@ set OFBIZ_HOME=%~p0..\ rem ### Simple easy to read line cd %OFBIZ_HOME% echo on -ant clean-data load-demo run-tests \ No newline at end of file +svn up && ant clean-data load-demo run-tests \ No newline at end of file |
Free forum by Nabble | Edit this page |