[英]Upgrade OpenCart in svn
I based my current OpenCart instalation on v1.5.2.1 (let's call this Orig_V1 ). 我当前的OpenCart安装基于v1.5.2.1 (我们将其称为Orig_V1 )。
I then heavily modified it and committed it in my SVN repository (let's call this Mod_V1 , SVN rev: r1). 然后,我对其进行了大量修改并将其提交到我的SVN存储库中(我们将其称为Mod_V1 ,SVN rev:r1)。
Now I want to upgrade it into v1.5.4.1 (let's call this Orig_V2 ) and keep the modifications I had on Mod_V1 (let's call this Mod_V2 ). 现在,我想将其升级到v1.5.4.1 (我们将其称为Orig_V2 )并保留对Mod_V1的修改(我们将其称为Mod_V2 )。
Any thoughts? 有什么想法吗?
You can use a merge and compare software to compare yours to the new upgrade. 您可以使用合并和比较软件将您的软件与新升级进行比较。 There are plenty of open source around.
周围有很多开源。 Try here.
试试这里
http://www.noupe.com/tools/25-useful-document-and-file-comparison-tools.html http://www.noupe.com/tools/25-useful-document-and-file-comparison-tools.html
Winmerge is a good one. Winmerge是个好人。 I use Notepad ++ with compare add-on.
我使用Notepad ++和compare附件。 I need to do the same thing myself eventually!
我最终需要自己做同样的事情!
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.