Warning: file_get_contents(/data/phpspider/zhask/data//catemap/0/svn/5.json): failed to open stream: No such file or directory in /data/phpspider/zhask/libs/function.php on line 167

Warning: Invalid argument supplied for foreach() in /data/phpspider/zhask/libs/tag.function.php on line 1116

Notice: Undefined index: in /data/phpspider/zhask/libs/function.php on line 180

Warning: array_chunk() expects parameter 1 to be array, null given in /data/phpspider/zhask/libs/function.php on line 181
Linux 如何从标记还原主干合并_Linux_Svn - Fatal编程技术网

Linux 如何从标记还原主干合并

Linux 如何从标记还原主干合并,linux,svn,Linux,Svn,上一次发布后,我在我的行李箱上贴了一个标签 svn copy https://svn.abc.com/svn/project/trunk https://svn.abc.com/svn/project/tags/release_20120722 -m "Tagging the release of feature" 如果我已将不需要的内容合并到主干中,并且需要恢复到该标记,我该怎么办?您需要像这样创建revert diffsvn diffhttps://svn.abc.com/svn/proj

上一次发布后,我在我的行李箱上贴了一个标签

svn copy https://svn.abc.com/svn/project/trunk https://svn.abc.com/svn/project/tags/release_20120722 -m "Tagging the release of feature"

如果我已将不需要的内容合并到主干中,并且需要恢复到该标记,我该怎么办?

您需要像这样创建revert diff
svn diffhttps://svn.abc.com/svn/project/trunk https://svn.abc.com/svn/project/tags/release_20120722 >tmp.diff
并用该补丁修补您的躯干补丁-p0-i tmp.diff

如何进行修补?