选择性修补
我有一个文件夹和该文件夹的补丁。现在，我不想将补丁中所做的所有更改都包含在我的提交中。我可以选择要在 Subclipse 中排除的文件，但是我可以仅对这些文件中的某些行执行相同的操作吗？
I have a folder and a patch for that folder. Now, I do not want to include every change made in the patch in my commit. I can select which files I want to exclude in Subclipse, but can I do the same with only certain lines in those files?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
您可以编辑补丁文件，或者应用补丁，然后从单独文件夹中原始文件的另一个未更改的副本复制回原始文件。就我个人而言，我可能会在 git 中提交我的工作，应用补丁（不使用 git），然后使用 git 只提交我喜欢的更改，或者重置我不喜欢更改的文件。
哦，抱歉，你是使用颠覆，我刚刚意识到。提出不同的解决方案并不是有意冒犯。我确信颠覆允许类似的方法。
You could probably edit the patch file, or apply the patch and then copy the originals back from another unchanged copy of the original files in a seperate folder. Personally, I would probably commit my work in git, apply the patch (without using git) and then use git to only commit the changes I liked, or to reset files I didn't like changes in.
Oh, sorry, you're using subversion, I just realised. Didn't mean to offend by suggesting a different solution. I'm sure subversion allows a similar approach.
您可以修补工作副本，然后在提交之前删除不需要的部分。使用 diff 命令查看工作副本中修补的部分与先前版本之间的差异。
基本上，您使用补丁来修改当前文件，然后再次修改它们以排除不需要的行。
You can patch your working copy, then remove those parts you don't want before committing. Use the diff command to see the differences between the patched parts and the previous version in your working copy.
Basically, you're using the patch to modify your current files, then modifying them again to exclude the unwanted lines.