svn conflicts: local delete, incoming delete upon update

svn  st查看更新的时候发现存在conflicts,提示很多 local delete, incoming delete upon update ，

 1 $:svn st
 2 ?     C IMIRROR.T3A.000.000.T28.img
 3       >   local delete, incoming delete upon update
 4 ?     C IMIRROR.T3A.000.000.T33.img
 5       >   local delete, incoming delete upon update
 6 ?     C IMIRROR.T3A.000.000.T34.img
 7       >   local delete, incoming delete upon update
 8 ?     C chips/sun8iw11p1/configs/default/0sys_partition_linux.fex
 9       >   local delete, incoming delete upon update
10 ?     C chips/sun8iw11p1/configs/default/1sys_partition_linux.fex
11       >   local delete, incoming delete upon update
12 ?     C chips/sun8iw11p1/configs/default/2sys_partition_linux.fex
13       >   local delete, incoming delete upon update
14 ?       chips/sun8iw11p1/configs/t3-p3/1280_400_sys_config.fex
15 ?       chips/sun8iw11p1/configs/t3-p3/1920_480_sys_config.fex
16 D       out/0sys_partition.fex
17 ?       out/1280_400_sys_config.fex
18 ?       out/1920_480_sys_config.fex
19 D       out/1sys_partition.fex
20 D       out/2sys_partition.fex
21 M       out/Vboot-resource.fex
22 M       out/Vboot.fex
23 M       out/Vrootfs.fex
24 M       out/boot-resource.fex
25 M       out/boot_package.fex
26 M       out/config.fex
27 M       out/sunxi.fex
28 M       out/sys_config.bin
29 M       out/sys_config.fex
30 M       out/sys_config_fix.fex
31 M       out/u-boot.fex
32 ?     C sun8iw11p1_linux_t3-p3_uart0.img
33       >   local delete, incoming delete upon update
34 Summary of conflicts:
35   Tree conflicts: 7

 

解决办法：

1、先 revert 冲突文件

1 $：svn revert   IMIRROR.T3A.000.000.T28.img  IMIRROR.T3A.000.000.T33.img   IMIRROR.T3A.000.000.T34.img    sun8iw11p1_linux_t3-p3_uart0.img  chips/sun8iw11p1/configs/default/0sys_partition_linux.fex   chips/sun8iw11p1/configs/default/1sys_partition_linux.fex    chips/sun8iw11p1/configs/default/2sys_partition_linux.fex
2 Reverted 'IMIRROR.T3A.000.000.T28.img'
3 Reverted 'IMIRROR.T3A.000.000.T33.img'
4 Reverted 'IMIRROR.T3A.000.000.T34.img'
5 Reverted 'sun8iw11p1_linux_t3-p3_uart0.img'
6 Reverted 'chips/sun8iw11p1/configs/default/0sys_partition_linux.fex'
7 Reverted 'chips/sun8iw11p1/configs/default/1sys_partition_linux.fex'
8 Reverted 'chips/sun8iw11p1/configs/default/2sys_partition_linux.fex'

 

2、删除掉冲突文件。

1 $:rm  IMIRROR.T3A.000.000.T28.img   IMIRROR.T3A.000.000.T33.img    IMIRROR.T3A.000.000.T34.img   chips/sun8iw11p1/configs/default/0sys_partition_linux.fex  chips/sun8iw11p1/configs/default/1sys_partition_linux.fex  chips/sun8iw11p1/configs/default/2sys_partition_linux.fex   sun8iw11p1_linux_t3-p3_uart0.img

 

3、重新checkin

 1 $:svn ci -m "message log" file1 file2  

 

posted @ 2017-02-07 15:57  mcdull^0^  阅读(458)  评论(0)  编辑  收藏  举报