blocks|key|349474|text|使用svn+merge：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|349475|svn+merge+-c+-[rev+num+that+deleted+the+file]+http://<path+to+repository>|code-block|syntax|javascript|349476|下面是一个例子：|349477|svn+merge+-c+-12345+https://svn.mysite.com/svn/repo/project/trunk
+++++++++++++%5E+The+negative+is+important|349478|对于TortoiseSVN+(我认为...)|349479|349480|在资源管理器中右击，转到TortoiseSVN+->+Merge...|unordered-list-item|349481|确保选择了"Merge+a+range+of+revision“，单击"Revision+range+to+merge”文本框中的“Next|349482|”，指定删除文件的版本|349483|选中"Reverse+merge“复选框，单击Next|349484|<代码>H111单击合并<代码>H212<代码>F213|349485|然而，这是完全未经测试的。|349486|349487|由OP编辑:这适用于我的TortoiseSVN版本(没有下一步按钮的旧版本)|349488|349489|转到已从|349490|中删除的文件夹|349491|在资源管理器中单击鼠标右键，转到TortoiseSVN+->+Merge...|349492|在From部分中输入执行删除|offset|length|style|BOLD|349493|H123的修订版本在e124到e225部分中输入修订版本|349494|诀窍是向后合并。感谢sean.bright为我指明了正确的方向！|349495|349496|编辑：我们正在使用不同的版本。我描述的方法在我的TortoiseSVN版本中工作得很好。|349497|同样值得注意的是，如果您正在反向合并的提交中有多个更改，那么在提交之前，一旦合并完成，您将需要恢复这些其他更改。如果您不这样做，这些额外的更改也将被撤销。|349498|entityMap^0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|1|4|0|0|0|0|0|3|0|0^^$0|@$1|2|3|4|5|6|7|1R|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|1S|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|1T|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|1U|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|1V|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|1W|8|@]|9|@]|A|$]]|$1|N|3|O|5|P|7|1X|8|@]|9|@]|A|$]]|$1|Q|3|R|5|P|7|1Y|8|@]|9|@]|A|$]]|$1|S|3|T|5|P|7|1Z|8|@]|9|@]|A|$]]|$1|U|3|V|5|P|7|20|8|@]|9|@]|A|$]]|$1|W|3|X|5|6|7|21|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|22|8|@]|9|@]|A|$]]|$1|10|3|-4|5|6|7|23|8|@]|9|@]|A|$]]|$1|11|3|12|5|6|7|24|8|@]|9|@]|A|$]]|$1|13|3|-4|5|6|7|25|8|@]|9|@]|A|$]]|$1|14|3|15|5|P|7|26|8|@]|9|@]|A|$]]|$1|16|3|17|5|6|7|27|8|@]|9|@]|A|$]]|$1|18|3|19|5|P|7|28|8|@]|9|@]|A|$]]|$1|1A|3|1B|5|P|7|29|8|@$1C|2A|1D|2B|1E|1F]]|9|@]|A|$]]|$1|1G|3|1H|5|6|7|2C|8|@]|9|@]|A|$]]|$1|1I|3|1J|5|6|7|2D|8|@]|9|@]|A|$]]|$1|1K|3|-4|5|6|7|2E|8|@]|9|@]|A|$]]|$1|1L|3|1M|5|6|7|2F|8|@$1C|2G|1D|2H|1E|1F]]|9|@]|A|$]]|$1|1N|3|1O|5|6|7|2I|8|@]|9|@]|A|$]]|$1|1P|3|-4|5|6|7|2J|8|@]|9|@]|A|$]]]|1Q|$]]

Use svn merge:

<pre><code>svn merge -c -[rev num that deleted the file] http://&lt;path to repository&gt;
</code></pre>

So an example:

<pre><code>svn merge -c -12345 https://svn.mysite.com/svn/repo/project/trunk
 ^ The negative is important
</code></pre>

For TortoiseSVN (I think...)

<ul>
<li>Right click in Explorer, go to TortoiseSVN -> Merge...</li>
<li>Make sure "Merge a range of revisions" is selected, click Next</li>
<li>In the "Revision range to merge" textbox, specify the revision that removed the file</li>
<li>Check the "Reverse merge" checkbox, click Next</li>
<li>Click Merge</li>
</ul>

That is completely untested, however.

<hr>

Edited by OP: This works on my version of TortoiseSVN (the old kind without the next button)

<ul>
<li>Go to the folder that stuff was delated from</li>
<li>Right click in Explorer, go to TortoiseSVN -> Merge...</li>
<li>in the From section enter the revision that did the delete </li>
<li>in the To section enter the revision before the delete.</li>
<li>Click "merge"</li>
<li>commit</li>
</ul>

The trick is to merge backwards. Kudos to sean.bright for pointing me in the right direction!

<hr>

Edit: We are using different versions. The method I described worked perfectly with my version of TortoiseSVN.

Also of note is that if there were multiple changes in the commit you are reverse merging, you'll want to revert those other changes once the merge is done before you commit. If you don't, those extra changes will also be reversed.

blocks|key|3344335|text|您应该能够只签出一个您想要恢复的文件。尝试类似于svn+co+svn://your_repos/path/to/file/you/want/to/restore@rev的命令，其中rev是文件所在的最后一个修订版。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3344336|不久前我必须这样做，如果我没记错的话，对svn使用-r选项是不起作用的；我必须使用:rev语法。(尽管我可能记得倒过来了……)|3344337|entityMap^0|O|1O|2I|3|0|K|3|P|2|15|4|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@$9|P|A|Q|B|C]|$9|R|A|S|B|C]|$9|T|A|U|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|V|8|@]|D|@]|E|$]]]|I|$]]

You should be able to just check out the one file you want to restore. Try something like <code>svn co svn://your_repos/path/to/file/you/want/to/restore@rev</code> where <code>rev</code> is the last revision at which the file existed.

I had to do exactly this a little while ago and if I remember correctly, using the <code>-r</code> option to <code>svn</code> didn't work; I had to use the <code>:rev</code> syntax. (Although I might have remembered it backwards...)

blocks|key|349521|text|使用Tortoise+SVN|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|349522|349523|如果您尚未提交更改，则可以在删除文件或目录的父文件夹上执行还原操作。|blockquote|349524|349525|如果您已经提交了已删除的文件，则可以使用存储库浏览器，更改到文件仍然存在的修订版本，然后使用命令Copy+to...从上下文菜单中。输入您的工作副本的路径作为目标，删除的文件将从存储库复制到您的工作副本。|349526|entityMap|0|LINK|mutability|MUTABLE|url|http://tortoisesvn.net/node/4^0|2|C|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@$A|T|B|U|1|V]]|C|$]]|$1|D|3|-4|5|6|7|W|8|@]|9|@]|C|$]]|$1|E|3|F|5|G|7|X|8|@]|9|@]|C|$]]|$1|H|3|-4|5|6|7|Y|8|@]|9|@]|C|$]]|$1|I|3|J|5|6|7|Z|8|@]|9|@]|C|$]]|$1|K|3|-4|5|6|7|10|8|@]|9|@]|C|$]]]|L|$M|$5|N|O|P|C|$Q|R]]]]

With <a href="http://tortoisesvn.net/node/4" rel="nofollow noreferrer">Tortoise SVN</a>:
<blockquote>
If you haven't committed your changes yet, you can do a revert on the parent folder where you deleted the file or directory.
If you have already committed the deleted file, then you can use the repository browser, change to the revision where the file still existed and then use the command Copy to... from the context menu. Enter the path to your working copy as the target and the deleted file will be copied from the repository to your working copy.
</blockquote>

blocks|key|3344399|text|如果你使用的是Tortoise+SVN，你应该能够将修改从那个版本恢复到你的工作副本中(有效地执行反向合并)，然后执行另一次提交来重新添加文件。要遵循的步骤如下：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3344400|从工作副本中浏览到您删除文件的文件夹。repo-browser.|3344401|Browse+|unordered-list-item|3344402|
|3344403|转到您删除文件的修订版。|3344404|3344405|在更改列表中找到您删除的文件。|3344406|3344407|右键单击该文件，然后转到"Revert+changes+from+history.|3344408|3344409|Commit+|3344410|ordered-list-item|3344411|repo-browser.|3344412|Browse+to+your+working+copy，keeping+history.|3344413|Commit+file以将其重新添加到存储库中。<|3344414|>G215>|3344415|3344416|3344417|3344418|entityMap^0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|1|1|0|0|0^^$0|@$1|2|3|4|5|6|7|18|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|19|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|1A|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|1B|8|@]|9|@]|A|$]]|$1|I|3|J|5|F|7|1C|8|@]|9|@]|A|$]]|$1|K|3|H|5|6|7|1D|8|@]|9|@]|A|$]]|$1|L|3|M|5|F|7|1E|8|@]|9|@]|A|$]]|$1|N|3|H|5|6|7|1F|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|1G|8|@]|9|@]|A|$]]|$1|Q|3|H|5|6|7|1H|8|@]|9|@]|A|$]]|$1|R|3|S|5|F|7|1I|8|@]|9|@]|A|$]]|$1|T|3|-4|5|U|7|1J|8|@]|9|@]|A|$]]|$1|V|3|W|5|6|7|1K|8|@]|9|@]|A|$]]|$1|X|3|Y|5|U|7|1L|8|@]|9|@]|A|$]]|$1|Z|3|10|5|U|7|1M|8|@]|9|@]|A|$]]|$1|11|3|12|5|U|7|1N|8|@]|9|@]|A|$]]|$1|13|3|-4|5|6|7|1O|8|@]|9|@]|A|$]]|$1|14|3|-4|5|6|7|1P|8|@]|9|@]|A|$]]|$1|15|3|-4|5|6|7|1Q|8|@]|9|@]|A|$]]|$1|16|3|-4|5|6|7|1R|8|@]|9|@]|A|$]]]|17|$]]

If you're using Tortoise SVN, you should be able to revert changes from just that revision into your working copy (effectively performing a reverse-merge), then do another commit to re-add the file. Steps to follow are:

<ol>
<li>Browse to folder in working copy where you deleted the file.</li>
<li>Go to repo-browser.</li>
<li>Browse to revision where you deleted the file.</li>
<li>In the change list, find the file you deleted.</li>
<li>Right click on the file and go to "Revert changes from this revision".</li>
<li>This will restore the file to your working copy, keeping history.</li>
<li>Commit the file to add it back into your repository.</li>
</ol>

blocks|key|3131636|text|为了完整起见，如果您知道要查找什么，那么您将在svn一书中找到以下内容。这就是你已经发现的：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3131637|Undoing+Changes|offset|length|3131638|Resurrecting+Deleted+Items|3131639|同样的事情，来自这本书的更新(更详细)的版本：|3131640|Undoing+Changes|3131641|Resurrecting+Deleted+Items|3131642|entityMap|0|LINK|mutability|MUTABLE|url|http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2|1|http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.3|2|http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo|3|http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.resurrect^0|0|0|F|0|0|0|Q|1|0|0|0|F|2|0|0|Q|3|0^^$0|@$1|2|3|4|5|6|7|11|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|12|8|@]|9|@$D|13|E|14|1|15]]|A|$]]|$1|F|3|G|5|6|7|16|8|@]|9|@$D|17|E|18|1|19]]|A|$]]|$1|H|3|I|5|6|7|1A|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|1B|8|@]|9|@$D|1C|E|1D|1|1E]]|A|$]]|$1|L|3|M|5|6|7|1F|8|@]|9|@$D|1G|E|1H|1|1I]]|A|$]]|$1|N|3|-4|5|6|7|1J|8|@]|9|@]|A|$]]]|O|$P|$5|Q|R|S|A|$T|U]]|V|$5|Q|R|S|A|$T|W]]|X|$5|Q|R|S|A|$T|Y]]|Z|$5|Q|R|S|A|$T|10]]]]

For completeness, this is what you would have found in the svn book, had you known what to look for. It's what you've discovered already:

<a href="http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2" rel="noreferrer">Undoing Changes</a>

<a href="http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.3" rel="noreferrer">Resurrecting Deleted Items</a>

Same thing, from the more recent (and detailed) version of the book:

<a href="http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo" rel="noreferrer">Undoing Changes</a>

<a href="http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.resurrect" rel="noreferrer">Resurrecting Deleted Items</a>

blocks|key|3131655|text|按照Sean+Bright的建议进行svn合并的问题是，它会重新引入与删除相同的修订中所做的其他更改。svn复制是一种更有针对性的操作，它只会影响已删除的文件。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3131656|使用Tortoise+SVN，您可以通过SVN副本恢复已从工作副本目录和更高版本的svn中删除的文件，如下所示：|3131657|3131658|浏览到以前包含该文件的工作副本文件夹。|unordered-list-item|3131659|在资源管理器中右键单击该文件夹，转到TortoiseSVN+->显示日志。|3131660|右键单击删除该文件的修订之前的修订号，然后选择"Browse+|3131661|单击删除的文件并选择"Copy+to+working+copy...“。”并保存。|3131662|3131663|删除的文件现在将位于working+copy文件夹中。要将其重新添加回SVN，请右键单击恢复的文件并选择SVN+Commit。|3131664|注意:此方法将保留还原文件的先前历史记录，但是要查看TortoiseSVN日志中的先前历史记录，您需要确保在日志消息对话框中取消选中"Stop+on+copy/rename“。|3131665|entityMap^0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|V|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|W|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|X|8|@]|9|@]|A|$]]|$1|H|3|I|5|G|7|Y|8|@]|9|@]|A|$]]|$1|J|3|K|5|G|7|Z|8|@]|9|@]|A|$]]|$1|L|3|M|5|G|7|10|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|11|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|12|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|13|8|@]|9|@]|A|$]]|$1|S|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|T|$]]

The problem with doing an svn merge as suggested by Sean Bright is that is reintroduces other changes made in the same revision as the deletion. An svn copy is a more targeted operation that will only affect the deleted files.

Using Tortoise SVN you can resurrect a file that has been deleted from your working copy directory and from later SVN revisions, via a svn copy as follows:

<ul>
<li>Browse to the working copy folder that previously contained the file.</li>
<li>Right click on the folder in Explorer, go to TortoiseSVN -> Show log.</li>
<li>Right click on the revision number just prior to the revision that deleted the file and select "Browse repository".</li>
<li>Right click on the deleted file and select "Copy to working copy..." and save.</li>
</ul>

The deleted file will now be in the working copy folder. To re-add it back to SVN, right click on the restored file and select SVN Commit.

NB: This method will preserve the previous history of the restored file, however to see the prior history in the TortoiseSVN log you need to make sure "Stop on copy/rename" is unchecked in the Log messages dialog.

blocks|key|351905|text|我能够恢复文件并且不丢失修订历史的最简单的方法是使用SVN+copy，上面的合并示例对我来说似乎是一种更复杂的方法来实现同样的功能。当您只是想要恢复修订时，为什么需要合并？|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|351906|我在这个例子中使用了下面的代码，它工作得很好。|351907|svn+copy+-m+'restoring+file'+-r+<rev_number_file_to_restore>+http://from/file.cs+http://pathTo/file.cs|code-block|syntax|javascript|351908|我似乎总是使用svn+copy作为服务器操作，所以不确定它是否可以与两个工作路径一起工作。|CODE|351909|entityMap^0|Q|8|0|0|0|7|8|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|U|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|V|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|W|8|@$9|X|A|Y|B|O]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|Q|$]]

The easiest way I have been able to restore files and not lose revision history is using SVN copy, the merge example above to me seems like a more complex way to achieve the same thing. Why is there a need to merge when you simply want to restore a revision?

I use the following in this instance and it works quite well.

<pre><code>svn copy -m 'restoring file' -r &lt;rev_number_file_to_restore&gt; http://from/file.cs http://pathTo/file.cs
</code></pre>

I always seem to use <code>svn copy</code> as a server operation so not sure if it works with two working paths.

blocks|key|3344483|text|使用Tortoise+SVN复制功能恢复提交的更改：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3344484|click+on+>显示日志选择右键单击包含已删除日志的父文件夹，然后右键单击之前进行更改/删除的版本|3344485|选择"browse+repository"|unordered-list-item|3344486|
|3344487|Select+|3344488|ordered-list-item|3344489|+files/folder|3344490|Select+to+|3344491|“，这将把文件/文件夹复制到head+revision|3344492|<代码>G213|3344493|3344494|希望这能有所帮助|3344495|entityMap^0|0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|10|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|11|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|12|8|@]|9|@]|A|$]]|$1|I|3|J|5|F|7|13|8|@]|9|@]|A|$]]|$1|K|3|-4|5|L|7|14|8|@]|9|@]|A|$]]|$1|M|3|N|5|L|7|15|8|@]|9|@]|A|$]]|$1|O|3|P|5|L|7|16|8|@]|9|@]|A|$]]|$1|Q|3|R|5|L|7|17|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|18|8|@]|9|@]|A|$]]|$1|U|3|-4|5|6|7|19|8|@]|9|@]|A|$]]|$1|V|3|W|5|6|7|1A|8|@]|9|@]|A|$]]|$1|X|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]]|Y|$]]

Use the Tortoise SVN copy functionality to revert commited changes:

<ol>
<li>Right click the parent folder that contains the deleted files/folder</li>
<li>Select the "show log"</li>
<li>Select and right click on the version before which the changes/deleted was done</li>
<li>Select the "browse repository"</li>
<li>Select the file/folder which needs to be restored and right click</li>
<li>Select "copy to" which will copy the files/folders to the head revision</li>
</ol>

Hope that helps

blocks|key|351919|text|我似乎总是使用svn+copy作为服务器操作，所以不确定它是否适用于两个工作路径。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|351920|以下是将删除的文件恢复到项目的本地工作副本的示例：|351921|svn+copy+https://repos/project/modules/module.js@3502+modules/module.js|code-block|syntax|javascript|351922|同时在项目目录中。这也适用于恢复整个目录。|351923|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|O|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|P|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

I always seem to use svn copy as a server operation so not sure if it works with two working paths.

Here is an example of restoring a deleted file into a local working copy of the project:

<pre><code>svn copy https://repos/project/modules/module.js@3502 modules/module.js
</code></pre>

While being inside the project directory. This works as well for restoring entire directories.

I deleted a file from a repo and now want to put it back. The best I can figure out is to:

<ul>
<li>update to the revision before the delete</li>
<li>copy the files elsewhere</li>
<li>update to head</li>
<li>copy the files back</li>
<li>add them</li>
<li>commit</li>
</ul>

That just smells bad and it looses all history to boot. There has got to be a better way to do this. I have already looked in <a href="http://svnbook.red-bean.com/" rel="noreferrer">The SVN Book</a> but didn't find anything and am now looking down the SVN tag list.

What is the correct way to restore a deleted file from SVN?

服务器

我从存储库中删除了一个文件，现在想把它放回去。我能想到的最好的办法是：在删除之前将文件更新为修订版本，然后将文件拷贝到elsewhereupdate 将文件拷贝回add head这只是闻起来很难闻，而且它失去了所有的历史。一定有更好的方法来做到这一点。我已经在中查找过了，但是没有找到任何东西，现在正在查找SVN标签列表...

问从SVN恢复已删除文件的正确方法是什么？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问从SVN恢复已删除文件的正确方法是什么？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问从SVN恢复已删除文件的正确方法是什么？
EN