首页 最新文章网站服务器运维正文

svn commit时报错Pristine text not found的处理方法


step4:get Date history
SVN log -q -r {2019-12-31}:HEAD  --stop-on-copy https://kxbdatdbpc:8443/svn/WJ-SVN/03_Resource/microservice-PrepositionEngine/branches/req20190715602_
12
------------------------------------------------------------------------
r136267 | zhangjing | 2019-12-31 08:34:55 +0800 (周二, 31 十二月 2019)
------------------------------------------------------------------------
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
--- Merging r136267 through r136271 into '.':
U    src\main\java\com\kxb\microservice\service\buy\base\ocrbiz\OcrCompanyEnum.java
A    src\main\java\com\kxb\microservice\service\buy\base\ocrbiz\Ocr2261BizImpl.java
U    src\main\java\com\kxb\microservice\service\buy\base\ocrbiz\Ocr2248BizImpl.java
continue(Y) or version(V) or exit(N) ?y
--- Merging r136267 through r136271 into '.':
U    src\main\java\com\kxb\microservice\service\buy\base\ocrbiz\OcrCompanyEnum.java
A    src\main\java\com\kxb\microservice\service\buy\base\ocrbiz\Ocr2261BizImpl.java
U    src\main\java\com\kxb\microservice\service\buy\base\ocrbiz\Ocr2248BizImpl.java
--- Recording mergeinfo for merge of r136267 through r136271 into '.':
 U   .
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
step6:svn merge HTTPS://kxbdatdbpc:8443/svn/WJ-SVN/03_Resource/microservice-PrepositionEngine/branches/req20190715602_12 -r {2019-12-31}:HEAD D:\works
pace\235microservice-PrepositionEngine
svn: E155010: commit failed (details follow):
svn: E155010: Pristine text '99e22b87b4ee3bdc3688ae3249e8889b0e0070cd' Not present


第一步:下载工具

qlite-shell-win32-x86-3080803.zip

第二步:将工具放置到对应工程的.svn的同级目录

image.png

第三步:CMD下执行命令sqlite3 .svn\wc.db

第四步:确认问题件

select * from nodes where checksum="$sha1$99e22b87b4ee3bdc3688ae3249e8889b0e0070cd";  -- 出错文件的标识

delete from nodes   where checksum="$sha1$99e22b87b4ee3bdc3688ae3249e8889b0e0070cd";

第五步:清理出错工程

image.png


评论

百度搜索

站点信息

  • 文章总数:507
  • 页面总数:7
  • 分类总数:29
  • 标签总数:860
  • 评论总数:285
  • 浏览总数:638909
Copyright ©2019-2020.Powered by©刘相涛 辽ICP备14000512号-5