如何使用 SVN 在每行基础上组成补丁/变更集?
使用 SVN,可以很容易地从包含每个文件的许多更改的工作副本中编写补丁/更改集。 Eclipse 客户端(例如命令行客户端、Subclipse 或 TortoiseSVN)涵盖了此类功能。
有没有办法在每行级别上执行此操作?
如果您正在并行处理两个影响同一个文件的错误修复,但您想从此文件创建两个补丁/提交,这将非常有用。
一种可能但麻烦的解决方法是使用第二个工作副本作为暂存区域。
Using SVN it is fairly easy to compose a patch/changeset off a working copy containing many changes on a per-file basis. Such functionality is covered by Eclipse clients like the command line client, Subclipse or TortoiseSVN.
Is there a way to do this on a per-line level?
This would be useful if you are working on two bug fixes in parallel which effect the same file but you want to create two patches/commits out of this file.
A possible but cumbersome workaround would be to use a second working copy as a staging area.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
并不真地。您可以手动拆分补丁,一次将一个补丁应用到新的工作副本上,但如果您问我的话,这有点麻烦。更好的方法是创建两个分支;一份用于错误修复 A,一份用于重大修复 B。
Not really. You could split the patch by hand and apply one at a time to a fresh working copy but that's kind of kludgey if you ask me. A better way would be to create two branches; one for bug fix A and one for big fix B.