使用SVN，如何有选择地创建补丁文件？

Question

I have a codebase with several changes in it that are best split up into several commits.

In git , I would use git add -p to select the changes I wanted from each file and create a commit and pull request based on those.

I'm new to SVN and I'm wondering about the best way to achieve this? It looks like I can do file-level selection, but not changes within those files?

I'm using TortoiseSVN as my local version control tool, but I'm happy to use another tool (has to run on Windows) if there's one that will do what I want.

Answer 1

This is something you won't get from SVN. Separating changes in your working area into multiple commit can only have a file granularity. You can't split changes from the same file into several commits.

So I'd say you should instead give a look at how git-svn works . It allows you to use Git over an SVN repository, with some limitations. You'll use git dcommit to push to the SVN repository for example. You must use a rebasing strategy over merging too. But otherwise, you get colored diffs, stash, rebasing, proper handling of multiple branches, proper formatting of patches by default, etc.

If you already know git, this will give you more, for less annoyance.

Answer 2

It looks like I can do file-level selection, but not changes within those files?

This is easily possible with VisualSVN plug-in for Visual Studio 2017. The feature is called QuickCommit and it helps you partially commit selected changes in a file.

Use the Commit this Block and Commit Selection context menu commands in the Visual Studio editor.

Here is an animated screenshot: