[英]svn client 1.4.4 any hope in applying a patch?
I am stuck using an old svn client 1.4.4. 我被困在使用旧的svn客户端1.4.4。 I was able to create a patch using the standard approach of piping to a file:
我能够使用管道到文件的标准方法创建补丁:
svn diff > ~/bug_fix.diff
Is there any hope in applying this patch? 应用此补丁有什么希望吗? I see that there is no "svn patch" sub-command in this version.
我看到这个版本中没有“svn patch”子命令。
Would it be possible to use a newer client to apply the patch without breaking compatibility with 1.4.4? 是否可以使用较新的客户端来应用补丁而不会破坏与1.4.4的兼容性?
Is there any hope in applying this patch?
应用此补丁有什么希望吗?
It can be compatible with ordinary OS patch
command 它可以兼容普通的OS
patch
命令
Apply subversion diff file by using the patch utility ( or patch.exe on windows .) 使用补丁实用程序( 或Windows上的patch.exe )应用subversion diff文件。
patch -p0 < ~/bug_fix.diff
or 要么
patch.exe -p0 < ~/bug_fix.diff
cygwin ended up being the solution here for me: cygwin最终成为我的解决方案:
diff -N -x .svn -rup ./original_trunk ./new_trunk > patch.diff
cd to ./original_trunk cd到./original_trunk
patch -p0 < ../patch.diff
original trunk should now have the changes from new trunk. 原始主干现在应该有来自新主干的更改。
Hardest part about this is getting the diff and patch utilities installed in cygwin. 最难的部分是在cygwin中安装diff和patch实用程序。 I installed the patch utility using apt-cyg and diff I found in the cygwin installer.
我在cygwin安装程序中使用apt-cyg和diff安装了补丁实用程序。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.