[急]求助:在使用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
1386
52
Alipay PHP SDK transfer error: How to solve the problem of 'Cannot declare class SignData'?
Apr 01, 2025 am 07:21 AM
Alipay PHP...
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,
Describe the SOLID principles and how they apply to PHP development.
Apr 03, 2025 am 12:04 AM
The application of SOLID principle in PHP development includes: 1. Single responsibility principle (SRP): Each class is responsible for only one function. 2. Open and close principle (OCP): Changes are achieved through extension rather than modification. 3. Lisch's Substitution Principle (LSP): Subclasses can replace base classes without affecting program accuracy. 4. Interface isolation principle (ISP): Use fine-grained interfaces to avoid dependencies and unused methods. 5. Dependency inversion principle (DIP): High and low-level modules rely on abstraction and are implemented through dependency injection.
How to automatically set permissions of unixsocket after system restart?
Mar 31, 2025 pm 11:54 PM
How to automatically set the permissions of unixsocket after the system restarts. Every time the system restarts, we need to execute the following command to modify the permissions of unixsocket: sudo...
How to debug CLI mode in PHPStorm?
Apr 01, 2025 pm 02:57 PM
How to debug CLI mode in PHPStorm? When developing with PHPStorm, sometimes we need to debug PHP in command line interface (CLI) mode...
Explain the concept of late static binding in PHP.
Mar 21, 2025 pm 01:33 PM
Article discusses late static binding (LSB) in PHP, introduced in PHP 5.3, allowing runtime resolution of static method calls for more flexible inheritance.Main issue: LSB vs. traditional polymorphism; LSB's practical applications and potential perfo
How to send a POST request containing JSON data using PHP's cURL library?
Apr 01, 2025 pm 03:12 PM
Sending JSON data using PHP's cURL library In PHP development, it is often necessary to interact with external APIs. One of the common ways is to use cURL library to send POST�...
Explain late static binding in PHP (static::).
Apr 03, 2025 am 12:04 AM
Static binding (static::) implements late static binding (LSB) in PHP, allowing calling classes to be referenced in static contexts rather than defining classes. 1) The parsing process is performed at runtime, 2) Look up the call class in the inheritance relationship, 3) It may bring performance overhead.
