在项目中有的文件是不需要添加到版本控制中去的,如:
[img]http://dl.iteye.com/upload/attachment/389728/038f7e2c-035e-3e9b-b52d-a6e43e7e0a47.jpg[/img]
我们可以通过svn:ignored 来使svn忽略它们
[img]http://dl.iteye.com/upload/attachment/389730/6ea4bfe8-9148-34fc-957d-456289813cd4.jpg[/img]
[img]http://dl.iteye.com/upload/attachment/389732/662da5d0-0890-31b1-8ab7-e156b47fe5f1.jpg[/img]
之后在项目的svn属性下就能看到:
[img]http://dl.iteye.com/upload/attachment/389734/f2923ef4-f1d3-3ad2-af78-2efd73592da1.jpg[/img]
再同步下项目会发现冲突,然后更新svn
[img]http://dl.iteye.com/upload/attachment/389736/a452d0b2-b253-3847-879c-c293d223297e.jpg[/img]
冲突解决,提交svn
[img]http://dl.iteye.com/upload/attachment/389740/b4170459-3e87-31d0-8d4f-e3eaedd990f6.jpg[/img]
大功告成!
[img]http://dl.iteye.com/upload/attachment/389728/038f7e2c-035e-3e9b-b52d-a6e43e7e0a47.jpg[/img]
我们可以通过svn:ignored 来使svn忽略它们
[img]http://dl.iteye.com/upload/attachment/389730/6ea4bfe8-9148-34fc-957d-456289813cd4.jpg[/img]
[img]http://dl.iteye.com/upload/attachment/389732/662da5d0-0890-31b1-8ab7-e156b47fe5f1.jpg[/img]
之后在项目的svn属性下就能看到:
[img]http://dl.iteye.com/upload/attachment/389734/f2923ef4-f1d3-3ad2-af78-2efd73592da1.jpg[/img]
再同步下项目会发现冲突,然后更新svn
[img]http://dl.iteye.com/upload/attachment/389736/a452d0b2-b253-3847-879c-c293d223297e.jpg[/img]
冲突解决,提交svn
[img]http://dl.iteye.com/upload/attachment/389740/b4170459-3e87-31d0-8d4f-e3eaedd990f6.jpg[/img]
大功告成!