blocks|key|3326324|text|SVN+Book说：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3326325|3326326|项被版本化为一种对象(文件、目录、链接)，但已被不同类型的对象所取代。|blockquote|3326327|3326328|3326329|所以也许它最初是一个单独的文件，但是你把它改成了一个目录，或者类似的东西？|3326330|entityMap|0|LINK|mutability|MUTABLE|url|http://svnbook.red-bean.com/en/1.8/svn.ref.svn.c.status.html^0|0|8|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|T|8|@]|9|@$A|U|B|V|1|W]]|C|$]]|$1|D|3|-4|5|6|7|X|8|@]|9|@]|C|$]]|$1|E|3|F|5|G|7|Y|8|@]|9|@]|C|$]]|$1|H|3|-4|5|6|7|Z|8|@]|9|@]|C|$]]|$1|I|3|-4|5|6|7|10|8|@]|9|@]|C|$]]|$1|J|3|K|5|6|7|11|8|@]|9|@]|C|$]]|$1|L|3|-4|5|6|7|12|8|@]|9|@]|C|$]]]|M|$N|$5|O|P|Q|C|$R|S]]]]

The <a href="http://svnbook.red-bean.com/en/1.8/svn.ref.svn.c.status.html" rel="noreferrer">SVN Book</a> says:

<blockquote>
 Item is versioned as one kind of object (file, directory, link), but has been replaced by different kind of object.
</blockquote>

So perhaps it was originally a single file, but you changed it to a directory, or something along those lines?

blocks|key|345272|text|下面是我所做的：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|345273|如果文件夹为Test|345274|345275|mv测试Test1|ordered-list-item|345276|svn移除测试|345277|mv+Test1测试|345278|345279|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|R|8|@]|9|@]|A|$]]|$1|H|3|I|5|G|7|S|8|@]|9|@]|A|$]]|$1|J|3|K|5|G|7|T|8|@]|9|@]|A|$]]|$1|L|3|-4|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

Here's what i did:

If the folder is Test

<ol>
<li>mv Test Test1</li>
<li>svn remove Test</li>
<li>mv Test1 Test</li>
</ol>

blocks|key|341878|text|从…|type|unstyled|depth|inlineStyleRanges|entityRanges|data|341879|svn+help+status|code-block|syntax|javascript|341880|“~”版本化项目被不同类型的项目阻挡|341881|我只看到文件权限发生变化，而svn对它没有执行访问权限的情况。|341882|希望这能有所帮助。|341883|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

From

<pre><code>svn help status
</code></pre>

'~' versioned item obstructed by some item of a different kind

I have only seen this where the file permissions had changed and svn had no execute access on it I beleive.

Hope this helps.

blocks|key|342747|text|修复这个问题最简单的方法是备份，然后删除具有此状态的文件夹或文件，然后执行"svn+up"：它不一定是文件重新放置的文件夹，可能只是.svn文件夹丢失或损坏。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|342748|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

The easiest way to fix this is to backup, then delete the folder or file that has this status and then do "svn up": it's not necessarily a folder relplaced by a file, it might be just that .svn folder is missing or corrupted.

blocks|key|340604|text|svn+delete+--keep-local+x
svn+commit+-m+"del+x"
svn+add+x
svn+commit+-m+"blah"|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|340605|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>svn delete --keep-local x
svn commit -m "del x"
svn add x
svn commit -m "blah"
</code></pre>

blocks|key|345266|text|当您删除文件夹中的.svn文件夹时(例如，当您删除目录，然后再次创建同一目录时)，或者当您将目录替换为符号链接或具有相同名称的文件时，可能会发生这种情况。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|345267|假设它是一个名为-+folder的文件夹，您可以通过在父文件夹中发出以下命令来修复此问题：|345268|$+find+a-folder+-type+d+-name+'.svn'+-print0+%7C+xargs+-0+rm+-Rf
$+svn+up+--force+.
svn:+Directory+'logs/.svn'+containing+working+copy+admin+area+is+missing
$+svn+up+--force+.
E++++a-folder
...
Updated+to+revision+n.|code-block|syntax|javascript|345269|然后就是添加/删除svn并再次提交更改的问题|345270|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|$]]

This can happen when you remove the .svn folder in a folder (by example when you remove a directory, and then you create the same directory again), or when you replace a directory with a symbolic link, or a file with the same name.

Supposing it's a folder called a-folder, you can fix this by issuing the following commands in the parent folder:

<pre><code>$ find a-folder -type d -name '.svn' -print0 | xargs -0 rm -Rf
$ svn up --force .
svn: Directory 'logs/.svn' containing working copy admin area is missing
$ svn up --force .
E a-folder
...
Updated to revision n.
</code></pre>

And then it's matter of svn adding/removing and commiting the changes again

blocks|key|340584|text|有一个类似的问题，SVN正在抱怨锁。下面是我们所做的：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|340585|340586|备份了文件|unordered-list-item|340587|删除了有问题的目录rm+-r+(Linux)|340588|在目录上运行了svn+cleanup+|offset|length|style|BOLD|340589|<代码>H19运行<代码>E110svn+up+--force<代码>E211目录<代码>H212<代码>F213|340590|entityMap^0|0|0|0|0|7|B|0|0^^$0|@$1|2|3|4|5|6|7|R|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|S|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|T|8|@]|9|@]|A|$]]|$1|F|3|G|5|E|7|U|8|@]|9|@]|A|$]]|$1|H|3|I|5|E|7|V|8|@$J|W|K|X|L|M]]|9|@]|A|$]]|$1|N|3|O|5|6|7|Y|8|@]|9|@]|A|$]]|$1|P|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|Q|$]]

Had a similar issue, SVN was complaining about a lock. Here's what we did:

<ul>
<li>Backed up the files</li>
<li>Removed the directory in question with rm -r (linux)</li>
<li>Ran svn cleanup on the directory</li>
<li>Ran svn up --force on the directory</li>
</ul>

blocks|key|3326474|text|我只想告诉大家，这是在Joomla中安装扩展时经常遇到的问题。这些扩展是通过CMS安装的，归apache所有，不需要群组编写。通常，下一步是将文件添加到SVN中，但是如果不执行sudo或更改文件perm，那么SVN就会在无法写入.svn目录时失败。这是一个简单的解决方案。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3326475|mv+foo+foo-bak
svn+up+foo
svn+revert+foo

#+just+for+good+measure.+Foo+should+not+show+up+in+the+two+following+commands.
ls+%7C+grep+foo
svn+st+%7C+grep+foo

mv+foo-bak+foo
svn+add+foo|code-block|syntax|javascript|3326476|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

I just want to share that this is an issue frequently encountered when installing extensions within Joomla. The extensions are installed through the CMS and are owned by apache with no group write. Generally the next step is to add the files to the SVN but if you don't sudo or change the file perms, then SVN fails when it can't write the .svn directory. Here's the easy solution.

<pre><code>mv foo foo-bak
svn up foo
svn revert foo

# just for good measure. Foo should not show up in the two following commands.
ls | grep foo
svn st | grep foo

mv foo-bak foo
svn add foo
</code></pre>

blocks|key|3326364|text|这也可能是Windows下的符号链接问题。当您将符号链接提交到SVN中，然后在Windows中签出它时，链接将更改为常规文件，这也报告为~。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3326365|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

It may be also matter of symbolic links under Windows. When you commit symbolic link into SVN and then check it out under Windows, links are changed to regular files and this is also reported as ~.

blocks|key|345345|text|在升级模块时，我经常遇到这种情况(例如)Joomla！、Wordpress或Drupal。有时，.svn目录会在升级过程中被删除。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|345346|#+rename+updated+directory
mv+foo+foo.new

#+restore+the+old+directory
svn+up+foo

#+merge+/+update+the+old+directory+with+new+items
#+notice+that+the+above+command+will+preserve+the+obsolete+files
#+so+you+should+do+a+diff+-r+in+order+to+remove+them
cp+-r+foo.new/*+foo

#+Add+files+commit,+etc
svn+add+foo/*
svn+delete+foo/xx
svn+commit+-m+"updated+module"|code-block|syntax|javascript|345347|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

I often had this while upgrading modules under (eg.) Joomla!, Wordpress or Drupal. Sometimes the .svn directory get removed by the upgrading process.

<pre><code># rename updated directory
mv foo foo.new

# restore the old directory
svn up foo

# merge / update the old directory with new items
# notice that the above command will preserve the obsolete files
# so you should do a diff -r in order to remove them
cp -r foo.new/* foo

# Add files commit, etc
svn add foo/*
svn delete foo/xx
svn commit -m "updated module"
</code></pre>

blocks|key|3326480|text|~+versioned+item+obstructed+by+some+item+of+a+different+kind
++++Second+column:+Modifications+of+a+file's+or+directory's+properties|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|3326481|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>~ versioned item obstructed by some item of a different kind
 Second column: Modifications of a file's or directory's properties
</code></pre>

I am getting a tilde symbol when I do an <code>svn status</code>.
Here is the output of the project after editing it in XCode.
<pre><code>svn status
M build/Currency_Converter.build/Currency_Converter.pbxindex/imports.pbxbtree
M build/Currency_Converter.build/Currency_Converter.pbxindex/pbxindex.header
M build/Currency_Converter.build/Currency_Converter.pbxindex/symbols0.pbxsymbols
~ build/Currency_Converter.build/Currency_Converter.pbxindex/strings.pbxstrings
M main.m
//more changed files
</code></pre>
Any idea what that means? Can't seem to find it on google or any of the svn cheat sheets.
Interestingly, I only edited main.m, but there are lots of modified files. I don't know why that would be. Anyone have any tips for working with SVN and XCode? Should I only be putting my source files under version control?
Edit: Caused by a file that was already under version control being replaced by a file of another type. In this case, strings.pbxstrings used to be a file and now became a directory. Moral of the story is don't put your build folder into version control.

What does the Subversion status symbol "~" mean?

Windows

Drupal

Linux

当我做svn status时，我得到了一个波浪符号。以下是在XCode中编辑该项目后的输出。svn statusM      build/Currency_Converter.build/Currency_Converter.pbxindex/imports.pbxbtreeM      build/Currency_Converter.build/Currency_Converter.pbxin

问Subversion状态符号"~“是什么意思？
EN

回答 11

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Subversion状态符号"~“是什么意思？EN

回答 11

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Subversion状态符号"~“是什么意思？
EN