开发者

How to temporarily apply (or archive) PATCH/DIFF changes from Tortoise SVN?

开发者 https://www.devze.com 2023-03-10 19:36 出处:网络
I\'ve been using Tortoise SVN + Visual SVN for about a year since left the corporate world to do my own startup. There\'s one feature in Tortoise SVN that I\'ve never figured out:

I've been using Tortoise SVN + Visual SVN for about a year since left the corporate world to do my own startup. There's one feature in Tortoise SVN that I've never figured out:

How can I bundle up a bunch of changes into a PATCH or DIFF file and either: A) share them with my co-founder; or B) archive them into a standalone change that I can either "apply" or "revert" on my dev box?

At my previous employer, we used an internal tool that let us build so-called DPK files that contained a set of local changes. You coul开发者_开发百科d add changed files to the DPK and then share it with colleagues. They could either review the changes in a Diff tool or apply all the changes from the DPK to test your change on their box. After the review was complete, you could then check in these changes. You could also have multiple DPK's applied at the same time (provided you didn't have overlapping changes).

I want to achieve the same thing with Tortoise SVN + Visual SVN in the VS2010 IDE.

My real-world scenario is that I have some extensive change pending but uncompleted on my box. I want to ZIP up these changes and store them in a DIFF file, revert the changes, move on to something else, work on that, and in a few days reapply my changes from the archived DIFF file.


Reluctantly answering my own question. This feature is available with Tortoise SVN. Basically, you make a PATCH file, distribute it or archive it, and then you apply the PATCH. The only trick is to make sure you're in the right location in the WC (Working Copy) when you do the "apply". When you apply, you'll get a popup menu to the left with a list of all files in the changelist. You can apply the patches one by one or in bulk. Seems to work great. I should have drilled into the docs more before posting this question.

Here's the text for picking the location:

"Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was doc/source/english/chapter1.xml and the first line in the patch file is Index: english/chapter1.xml then you need to apply the patch to the doc/source/ folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TortoiseSVN will notice and suggest the correct level."

Be sure to pick the location carefully. If Tortoise SVN can't find it because you selected the wrong node in the VS file explorer, it will try to find a matching location and that might be wrong. In my tests, the Patch feature actually tried to map to a branch (!!) when I specified the wrong location.

Here's the relevant link:

http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-patch.html

0

精彩评论

暂无评论...
验证码 换一张
取 消

关注公众号