English 中文(简体)
SVN st在破碎的国家
原标题:SVN stuck in broken state
  • 时间:2012-01-13 16:27:10
  •  标签:
  • svn

我最近做了一个<代码>svn 添加Foo/,因为有一份称为<代码>的文件(不是名录)而没有。 Foo/svn

我没有真正思考的话,就在<条码>温度波/svn;在上面添加Foo/。

之所以失败,是因为“Foo”已经处于版本控制之下,尽管svn status显示

~ Foo

而不是

A Foo

因此,我可以打上“条形”。 页: 1

How can I fix this?

最佳回答

如果你对Foo的斜体含量表示怀疑,你可以在条目中看到。 这意味着,即使Svn 当地干.没有将其.放到Foo 。

An svn revert Foo forces Svn to remove it from its entries.

If you ask now for the status, your directory would be

?       Foo

然后,你可以重新打上<代码>svn 添加,并将工作。

问题回答

要求了解该指南的更新情况,以便在你到场之前将工作书收复给国家。

由于你刚刚删除了仅载有元数据的<代码>Foo/svn,你在当地对<代码>的文档进行了改动。 F/仍然存在,你可以遵循这些步骤,保存你们的所有改动,并贴上破碎的工作副本:

  1. svn info to get the revision number of the working copy, you will see something like Revision: 94168
  2. mv Foo Foo.bak to backup the broken Foo directory
  3. svn up -r 94168 Foo to re-checkout Foo from the remote repository, please replace 94168 with your actual revision number
  4. rsync -av --exclude= .svn Foo.bak/ Foo/ to override the newly checked out Foo/ with the files in previous backed up Foo.bak, but keep the right .svn meta data.
  5. svn status Foo, then you should see all your local changes (if you indeed made changes) to Foo

不应进行内部档案合并。

页: 1 Foo/。 然后是svn up,人工合并改动。 然后,请添加<条码>。 Foo/目录。





相关问题
Best practices for Subversion and Visual Studio projects

I ve recently started working on various C# projects in Visual Studio as part of a plan for a large scale system that will be used to replace our current system that s built from a cobbling-together ...

Changing username in SVN+SSH URI on the fly in working copy

I am using SVN+SSH to check out a working copy of repository from an SVN server on which all developers are members of a developer group and have full read/write permissions on the repository ...

ASP.NET MVC: How should it work with subversion?

So, I have an asp.net mvc app that is being worked on by multiple developers in differing capacities. This is our first time working on a mvc app and my first time working with .NET. Our app does not ...

How to search for file in subversion server?

Is there a way to search for a file in a subversion repository? Something similar to Unix find command, with which I can find the location of a file in a repository. I know there is svn list, but ...

热门标签