如何取消对重新安排的项目的拼写? [英] How can I un-quagmirize my rearranged project?

问题描述

使用以下步骤(摘自"实用的Subversion指南"的第39页):

Using the following steps (taken from page 39 of "Pragmatic Guide to Subversion"):

* Using Windows Explorer, right-drag the file to a different location in your working copy, and choose "SVN Move versioned item(s) here."

* Commit your changes by right-clicking the base of your working copy and choosing SVN Commit...

...我将几个文件移动到了在项目中创建的新文件夹(类，数据，表单).

...I moved several files into new folders I created within my project (Classes, Data, Forms).

然后我在Visual Studio中重新加载项目并混入F6时，我得到了其中五个错误信息:

When I then re-loaded the project in Visual Studio and mashed F6, I got five of these err msgs:

无法为"ChosenPlatypi.resx"创建清单资源名称.找不到文件"C:\ duckBills \ duckBills \ ChosenPlatypi.cs".

所以我看到我在资源管理器中移动的所有文件都不在解决方案资源管理器中的文件夹中，而是在其先前的位置(直接在项目下方)，但是现在带有红色的x和黄色他们上的警告图标.

So I saw that all of the files that I had moved over in Explorer were NOT in their folders in the Solution Explorer, but were in their previous location (directly below the project), but now with a red x and a yellow warning icon on them.

所以我尝试将它们拖到我创建的文件夹中(这已经在Windows资源管理器中完成了)，但这给了我错误，"找不到源文件ChosenPlatypi.cs "

So I tried dragging them into the folders I had created (which I had already done in Windows Explorer), but that gives me the error, "The source file ChosenPlatypi.cs could not be found"

因此，我决定通过撤消更改来重新开始"(在Windows资源管理器中，右键单击base/trunk目录，选择Tortoise SVN | Show Log，突出显示造成混乱的更改，然后选择从...还原更改此修订."

So I decided to "start over" by reversing the changes (In Windows Explorer, right-clicked the base/trunk directory, selected Tortoise SVN | Show Log, highlighted the change that wreaked the mayhem, and selected "Revert changes from this revision."

Visual Studio中的解决方案现在可以再次编译，但是以前移到我创建的新子文件夹中的文件上涂有黄色加号，并在其下带有红色风车(或... ????)图标/字形.

The solution in Visual Studio now compiles again, BUT the files that I had previously moved into new subfolders I created are decoated with a yellow plus sign and, beneath those, red pinwheel (or ...????) icons/glyphs.

我创建的一个子文件夹仍然存在(窗体)，复制到其中的一个文件集(* .cs，*.Designer.cs和* .resx)仍然在那里.我不知道该文件移动做了什么(如果有的话)...

ONE of the subfolders I created is still there (Forms), and ONE of the file sets (*.cs, *.Designer.cs, and *.resx) I copied into it is still there. I don't know what, if anything, I did differently with that file move...

推荐答案

您是否在Apache Subversion存储库中或文件系统(即磁盘)上移动了文件?如果要移动或重命名文件，请在存储库中进行操作，然后更新本地工作副本.

Did you move the files in the Apache Subversion repository or on the file system (i.e. on the disk)? If you are moving or renaming files, do it in the repository and then update your local working copy.

如果已将它们移动到文件系统上，则红色X" 图标表示该文件已被删除，而黄色警告图标" 则表示存在冲突，你应该解决.请参见 Tortoise SVN资源管理器集成有关更多信息.

If you have moved them on the file system, the "red X" icon means the file has been deleted and the "yellow warning icon" means a conflict that you should resolve. See Tortoise SVN explorer integration for more information.

备份所有重要更改后，请解决所有冲突，然后对所有受影响的文件夹提交更改.请记住，历史记录仍在存储库中，并且您可以根据需要更新到较早的版本.

After backing up any important changes, resolve any conflicts and then commit the changes for all the folders affected. Remember that the history is still present in the repository and you can just update to an earlier revision if needed.

如果您打算在Visual Studio解决方案中重命名或移动文件，请考虑使用Visual Studio插件，例如 VisualSVN 或 AnkhSVN 即可在IDE中简化此操作.将它们移到解决方案资源管理器中将变得更加容易和轻松.

If you intend to rename or move files around in a Visual Studio solution, consider using a Visual Studio plug-in like VisualSVN or AnkhSVN to make this much easier within the IDE. Moving them in the solution explorer will be much easier and hassle-free.

这篇关于如何取消对重新安排的项目的拼写?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！