[急]求助:在使用SVN版本控制中出现严重的问题,求原因,
一个同事A在某次硬盘故障后,check out新项目,把备份的代码覆盖刚刚检出的项目,提交SVN.(这应该是一个错误的操作,给几个同事带来了一些麻烦).
而在此之前,另一个同事B大约有一天没有更新和提交,在此之后,同事B也一直没有更新和提交,有一个星期.
今天后同事B进行svn更新操作后,代码恢复到同事A上传的版本. 最近一周的代码全部消失了.
大家都很不解:理论上存在差异应该报冲突,或者合并,为何会替换本地的.
求解.
另外,还有恢复的办法吗?
回复讨论(解决方案)
更新操作是从 svn 中取回，只要 svn 的当前版本号高于本地的，就不会有提示
解决方法就是回滚到”check out新项目“时的版本
但是本地代码被覆盖了，之前又没有提交。估计是回不来了
更新操作是从 svn 中取回，只要 svn 的当前版本号高于本地的，就不会有提示
一般来说 版本库不是总是比本地高的吗? 应该是合并才对呀...
问题是你不是在提交啊
或者说错不在同事A而在同事B
如果提交到svn的话，可以回滚下，
但是如果本地代码被覆盖后，估计找不回来了
备份的代码是否有.svn文件，如果有的话，直接替换而不是合并，可能有这一方面原因吧！
试着根据每次版本提交的时间，找下之前的版本文件。
估计是备份的代码里有.svn文件 把之前的覆盖了
svn可以查看?史版本,能找回出??前的那?版本
Hot AI Tools
Undresser.AI Undress
AI-powered app for creating realistic nude photos
AI Clothes Remover
Online AI tool for removing clothes from photos.
Undress AI Tool
Undress images for free
Clothoff.io
AI clothes remover
Video Face Swap
Swap faces in any video effortlessly with our completely free AI face swap tool!
Hot Article
Hot Tools
Notepad++7.3.1
Easy-to-use and free code editor
SublimeText3 Chinese version
Chinese version, very easy to use
Zend Studio 13.0.1
Powerful PHP integrated development environment
Dreamweaver CS6
Visual web development tools
SublimeText3 Mac version
God-level code editing software (SublimeText3)
Hot Topics
1655
14
1413
52
1306
25
1252
29
1226
24
Explain JSON Web Tokens (JWT) and their use case in PHP APIs.
Apr 05, 2025 am 12:04 AM
JWT is an open standard based on JSON, used to securely transmit information between parties, mainly for identity authentication and information exchange. 1. JWT consists of three parts: Header, Payload and Signature. 2. The working principle of JWT includes three steps: generating JWT, verifying JWT and parsing Payload. 3. When using JWT for authentication in PHP, JWT can be generated and verified, and user role and permission information can be included in advanced usage. 4. Common errors include signature verification failure, token expiration, and payload oversized. Debugging skills include using debugging tools and logging. 5. Performance optimization and best practices include using appropriate signature algorithms, setting validity periods reasonably,
How does session hijacking work and how can you mitigate it in PHP?
Apr 06, 2025 am 12:02 AM
Session hijacking can be achieved through the following steps: 1. Obtain the session ID, 2. Use the session ID, 3. Keep the session active. The methods to prevent session hijacking in PHP include: 1. Use the session_regenerate_id() function to regenerate the session ID, 2. Store session data through the database, 3. Ensure that all session data is transmitted through HTTPS.
What is REST API design principles?
Apr 04, 2025 am 12:01 AM
RESTAPI design principles include resource definition, URI design, HTTP method usage, status code usage, version control, and HATEOAS. 1. Resources should be represented by nouns and maintained at a hierarchy. 2. HTTP methods should conform to their semantics, such as GET is used to obtain resources. 3. The status code should be used correctly, such as 404 means that the resource does not exist. 4. Version control can be implemented through URI or header. 5. HATEOAS boots client operations through links in response.
How do you handle exceptions effectively in PHP (try, catch, finally, throw)?
Apr 05, 2025 am 12:03 AM
In PHP, exception handling is achieved through the try, catch, finally, and throw keywords. 1) The try block surrounds the code that may throw exceptions; 2) The catch block handles exceptions; 3) Finally block ensures that the code is always executed; 4) throw is used to manually throw exceptions. These mechanisms help improve the robustness and maintainability of your code.
What are anonymous classes in PHP and when might you use them?
Apr 04, 2025 am 12:02 AM
The main function of anonymous classes in PHP is to create one-time objects. 1. Anonymous classes allow classes without names to be directly defined in the code, which is suitable for temporary requirements. 2. They can inherit classes or implement interfaces to increase flexibility. 3. Pay attention to performance and code readability when using it, and avoid repeatedly defining the same anonymous classes.
What is the difference between include, require, include_once, require_once?
Apr 05, 2025 am 12:07 AM
In PHP, the difference between include, require, include_once, require_once is: 1) include generates a warning and continues to execute, 2) require generates a fatal error and stops execution, 3) include_once and require_once prevent repeated inclusions. The choice of these functions depends on the importance of the file and whether it is necessary to prevent duplicate inclusion. Rational use can improve the readability and maintainability of the code.
Explain different error types in PHP (Notice, Warning, Fatal Error, Parse Error).
Apr 08, 2025 am 12:03 AM
There are four main error types in PHP: 1.Notice: the slightest, will not interrupt the program, such as accessing undefined variables; 2. Warning: serious than Notice, will not terminate the program, such as containing no files; 3. FatalError: the most serious, will terminate the program, such as calling no function; 4. ParseError: syntax error, will prevent the program from being executed, such as forgetting to add the end tag.
PHP and Python: Comparing Two Popular Programming Languages
Apr 14, 2025 am 12:13 AM
PHP and Python each have their own advantages, and choose according to project requirements. 1.PHP is suitable for web development, especially for rapid development and maintenance of websites. 2. Python is suitable for data science, machine learning and artificial intelligence, with concise syntax and suitable for beginners.
