[Erp5-dev] erp5 subversion - update business template x 2

[Aurélien Calonne]

Le mer 11 octobre 2006 21:14, Bartek Gorny a écrit :
> Hello
>
> What is actually the difference between "Update Business Template from
> SVN" and "Update Business Template from SVN"? One of them does
> BusinessTemplate_doSvnUpdate, the other does
> BusinessTemplate_doSvnUpdateKeep - what does it keep? BTW, if they do
> different things, perhaps it would be useful to label them
> differently...
>
Hello,

I think the fact that you have the same title for two differents actions come 
from either an update of bt which hasn't work well either from a 
misconfiguration of the bt at a time.
On my site I have :
- BusinessTemplate_doSvnUpdate labelled "Revert & Update Business Template 
from SVN" which will revert all you local changes in zodb and install the 
last changes from the bt (similar to svn revert & svn update)
- BusinessTemplate_doSvnUpdateKeep  labelled "Update Business Template from 
SVN" which will install last changes from the bt but merge your changes 
(similar to svn update)

-- 
Aurélien