SVN的“local edit, incoming delete upon update”问题

SVN的“local edit, incoming delete upon update”问题

在网上查，说是：今天svn更新的时候，删了一个目录，出现了这个问题。

svn revert file

但是这个命令只能解决一个文件的local edit问题。我这是目录出错。看了一下svn的help：revert: Restore pristine working copy file (undo most local edits).usage: revert PATH...Note: this subcommand does not require network access, and resolvesany conflicted states.Valid options:--targets ARG : pass contents of file ARG as additional args-R [--recursive] : descend recursively, same as --depth=infinity--depth ARG : limit operation by depth ARG ('empty', 'files','immediates', or 'infinity')-q [--quiet] : print nothing, or only summary information--changelist [--cl] ARG : operate only on members of changelist ARGGlobal options:--username ARG : specify a username ARG--password ARG : specify a password ARG--no-auth-cache : do not cache authentication tokens--non-interactive : do no interactive prompting--trust-server-cert : accept SSL server certificates from unknowncertificate authorities without prompting (but onlywith '--non-interactive')--config-dir ARG : read user configuration files from directory ARG--config-option ARG : set user configuration option in the format:FILE:SECTION:OPTION=[VALUE]For example:servers:global:http-library=serf所以加上-R参数。

svn revert dir -R

成功恢复了。