svn

How to merge branch back to main branch and avoid tree conflicts - TortoiseSVN

安稳与你 提交于 2020-02-06 07:26:25
问题 I have source files managed in SVN using TortoiseSVN. I had added files and committed them to a revision, and subsequently decided to branch. I branched with the files I needed, and performed a delete on the trunk of the files that wasn't intended to be used. Now I'm attempting to reintegrate the branch to the main trunk. Using tortoise, I have merged from trunk to branch the range of revisions from AFTER the delete on the trunk to head. This brings the branch up to date. Now I switch to the

How to deal with a git that has git-svn and pure git remotes

纵然是瞬间 提交于 2020-02-06 04:11:41
问题 I have two repositories, one is still an svn and acts as the main place, and another is pure git where is the daily work. I've my local clone using git svn clone svn+ssh://... and adding a remote using git remote add git@... . After a refactoring with its commits and branches, the git master has the directory structure modified and when I try to git svn dcommit a bunch of conflicts arise in what looks like a rebase to the svn . It's like the mv of files and directories to rename and relocate

centos svn迁移备份的两种方法

本秂侑毒 提交于 2020-02-05 18:15:47
svn备份方式对比分析 一般采用三种方式: 1、svnadmin dump 2、svnadmin hotcopy 3、svnsync 注意,svn备份不宜采用普通的文件拷贝方式(除非你备份的时候将库暂停),如copy、rsync命令。 曾经用rsync命令来做增量和全量备份,在季度备份检查审计中,发现备份出来的库大部分都不可用,因此最好是用svn本身提供的功能来进行备份。 优缺点分析: 第一种 svnadmin dump是官方推荐的备份方式 优点是:比较灵活,可以全量备份也可以增量备份,并提供了版本恢复机制。 缺点是:如果版本比较大,如版本数增长到数万、数十万,那么dump的过程将非常慢;备份耗时,恢复更耗时;不利于快速进行灾难恢复。 个人建议在版本数比较小的情况下使用这种备份方式。 第二种 svnadmin hotcopy原设计目的估计不是用来备份的,只能进行全量拷贝,不能进行增量备份; 优点是:备份过程较快,灾难恢复也很快;如果备份机上已经搭建了svn服务,甚至不需要恢复,只需要进行简单配置即可切换到备份库上工作。 缺点是:比较耗费硬盘,需要有较大的硬盘支持(俺的备份机有1TB空间,呵呵)。 第三种 svnsync实际上是制作2个镜像库,当一个坏了的时候,可以迅速切换到另一个。不过,必须svn1.4版本以上才支持这个功能。 优点是:当制作成2个镜像库的时候起到双机实时备份的作用

SVN propset svn:externals Error

℡╲_俬逩灬. 提交于 2020-02-05 05:12:51
问题 I am trying to set the external to a specific revision via command line. Earlier I got an error indicating that I needed to use the working directory when I used the repository URL for both my source and destination. I changed the destination folder to my working directory. I do not want to have the externed folder added to my working directory(seems it should be unnecessary). Notes: http replaced with htp to avoid hyperlinks. htps://svn.company.com/svn/Build = location of the externed folder

VisualSVN - set up repository and set access to use Basic Windows Authentication - login results in 403?

ぐ巨炮叔叔 提交于 2020-02-04 04:47:10
问题 I've set up my repository using VisualSVN Server, imported an existing repostiory, and set the user access rights to use Windows Authentication (Basic). I then try to access the URL of the created repository; after entering my username and password, I am immediately greeted with a 403 Forbidden notice (even though I have specified both Read / Write privileges to myself using VisualSVN Server Manager console). I've tried using VisualSVN's own username/password combo, and this works

VisualSVN - set up repository and set access to use Basic Windows Authentication - login results in 403?

房东的猫 提交于 2020-02-04 04:47:07
问题 I've set up my repository using VisualSVN Server, imported an existing repostiory, and set the user access rights to use Windows Authentication (Basic). I then try to access the URL of the created repository; after entering my username and password, I am immediately greeted with a 403 Forbidden notice (even though I have specified both Read / Write privileges to myself using VisualSVN Server Manager console). I've tried using VisualSVN's own username/password combo, and this works

Looking for a way to store versions in a binary compiled from git repo

会有一股神秘感。 提交于 2020-02-03 16:04:51
问题 I'm looking for some tips to implement binary --version that would provide good information about the version it was compiled from. The project is using autotools build system, and is stored in a git repo that acts as a SVN frontend. What I would like to have inside the binary is: compilation time SVN commit that acts as base last git commit ID and time if possible the last commit that affects this specific binary 回答1: You'll probably want to write your source code to use a #defined constant

svn访问版本库时一直提示: please wait while the repository browser is initializing

大兔子大兔子 提交于 2020-02-02 09:24:11
最近不知道做了什么操作,原来正常的SVN Check In/Out都无法正常操作。 正常Check In的动作,几秒钟就会操作完成,但是我却等了好久好久,然后提示Connection timed out. 一开始怀疑是SVN Client的版本问题,直接升级到最新版,还是无法解决。 再来怀疑是网络问题,甚至看到有人讲到无线网络的MTU值不匹配也会引起此问题,结果也是无解。 再后来,我用Windows切换到另一种用户使用SVN时,给了我思路,因为用另一个用户是可以正常开户SVN的,只是要做一些初始化配置即可, 因此,我切到原来异常的用户环境下,将以下两个目录全部删除 C:\Users\****\AppData\Roaming\TortoiseSVN C:\Users\****\AppData\Roaming\Subversion 删除后再进SVN时,这时也提示我要初始化配置,如下图,配完后就正常了。 来源: https://www.cnblogs.com/dimg/p/11083035.html

SVN使用心得

半腔热情 提交于 2020-02-02 08:52:30
CVS全称是Concurrent Version System,所以这里有一个Version的概念, 这个Version在本地和服务器上都存在 , 当你commit一个文件到服务器时,服务器会先检查你要commit的版本和服务器版本,如果两个没有冲突则更新成功,如果有冲突则报错。同样的,对于update操作来说,服务器只管更新比自己的版本低的,所以你修改了以后的本地文件不会被更新。 1.如果你动了SVN(或CVS)上的某个东西,而未commit到服务器上,此时你如果你用update操作,不会把SVN上的东西更新到你本地,也就是说,你在你的机器上看到的还是你更改之后的东西. 2.在commit操作之前,最好要先update一下,原因是有可能别人把新版本放到服务器上了,而你并未更新到你本地,此时如果你没有进行update操作,而直接commit,就会报错. 3.如果你想放弃你的修改,直接采用服务器里的页面,你必须先把你的修改还原,然后再从服务器上update下来就OK了. 掌握原则 1、Team-synchronize 2、Incoming Mode 全部update 3、Outgoing Mode 全部commit 4、Confilcts Mode 解决冲突,另存、对比、Override and Update、修改、Commit 若从资源库更新代码,建议打开SVN

svn下载及安装

别等时光非礼了梦想. 提交于 2020-02-02 01:08:15
windows下安装svn客户端 下载网址:https://tortoisesvn.net/downloads.html 点击Downloads 选择要下载的版本 汉化包下载 注意汉化包要跟下载的是svn文件在一个文件夹中 来源: CSDN 作者: 自己人生的主导者 链接: https://blog.csdn.net/weixin_44470902/article/details/104136780