svn

TortoiseSVN 和 VisualSVN

由 旧时模样 提交于 2020-01-11 05:09:20
ylbtech-Miscellaneos：TortoiseSVN 和 VisualSVN 1. TortoiseSVN 百科 返回顶部 1-1、百科 TortoiseSVN 是 Subversion 版本控制系统的一个免费开源客户端，可以超越时间的管理文件和目录。文件保存在中央版本库，除了能记住文件和目录的每次修改以外，版本库非常像普通的文件服务器。你可以将文件恢复到过去的版本，并且可以通过检查历史知道数据做了哪些修改，谁做的修改。这就是为什么许多人将 Subversion 和版本控制系统看作一种“时间机器”。 1-2、网址 https://baike.baidu.com/item/TortoiseSVN 1-3、 2. VisualSVN 百科 返回顶部 2-1、百科 集成了Subversion和Apache，简化了手工配置Subversion的繁琐步骤。 VisualSVN Server是免费的，而VisualSVN是收费的。VisualSVN是SVN的客户端，和Visual Studio集成在一起， VisualSvn Server是SVN的服务器端，包括Subversion、Apache和用户及权限管理，优点在上面已经说过了。 2-2、网址 https://baike.baidu.com/item/VisualSVN 2-3、TortoiseSVN下载，安装，配置，常用操作

Git: Files pushed from local repo not showing up in remote git repo

由 Deadly 提交于 2020-01-11 04:05:10
问题 I'm brand new to git and am just starting to figure things out. I have been trying to figure out git on my remote dev server as well as my local machine. I have installed git successfully on both my remote server and my local machine (OSX). I am using a mac git client called Tower, here is my dilemma... I can successfully create a bare repository on my remote server, no problems there. I then open up Tower and attempt to clone my remote repository to my local machine. I've been able to do

why use branches in svn?

由 心不动则不痛 提交于 2020-01-11 03:27:06
问题 i know that you could organize your files according to this structure in svn: trunk branches tags that you copy the trunk to a folder in branches if you want to have a seperate development line. later on you merge this branch back to trunk. but i wonder why me and my group should do this. why should one copy the trunk to a branch and work with this copy just to merge it back to the trunk, and mean while the code is frequently updated/commited to stay in sync with the trunk. why not just work

Linux命令行操作SVN合并

由 ╄→гoц情女王★ 提交于 2020-01-10 17:49:05
环境 Centos 7 SVN 1.7 若需要部署SVN服务端，可以参考 Centos7配置SVN服务端 将一个oa项目作为示例： Shell> svn ls svn://localhost/oa 　　branches/ 　　tags/ 　　trunk/# 假设当前trunk刚刚发版，版本号是1.0，所以要打个1.0的tag，并创建一个修复bug的分支Shell> svn cp svn://localhost/oa/trunk svn://localhost/oa/tags/1.0 -m '1.0 tag'Shell> svn cp svn://localhost/oa/trunk svn://localhost/oa/branches/1.0-bug -m '1.0 bug branch'Shell> svn co svn://localhost/oa　　# 导出代码到本地，方便后文演示 四种合并模式 注：下文都是以从主干创建了分支作为前提进行描述。 sync merge 同步合并；创建分支后修改了主干，需要将主干的修改同步到分支时使用 cherry-pick merge 选择合并；将指定的某一次或多次修改合并到目标 reintegrate merge 重聚合并；分支任务完成，需要将分支的修改合并到主干时使用，完成后删除分支（很多翻译为复兴，我觉得重聚好一点

如何搭建SVN服务器

由 妖精的绣舞 提交于 2020-01-10 14:00:03
前几天，想搭建自己的SVN服务器，网上找到下面的文档，按照文中所述步骤搭建的SVN服务器运行正常。现推荐给打算建立SVN服务器的朋友，全文如下—— 搭建SVN服务器 WINDOWS下搭建SVN服务器端的步骤： 1、安装Apache 2、安装SVN在C:/Program Files/Subversion下。 3、安装Tortoise 安装Tortoise完毕时会提示重新启动计算机, 重启完毕后安装简体中文语言包, 然后在任意目录点击右键, 会发现多出了一些SVN相关菜单, 选择其中的TortoiseSVN, 选择子菜单"Settings", 设置Language为"中文(简体)" 。 4、检查C:/Program Files/Apache Group/Apache2/modules下是不是已经有了mod_dav_svn.so和mod_authz_svn.so。（如果没有，可以从C:/Program Files/Subversion/bin下拷过来。） 5、检查C:/Program Files/Apache Group/Apache2/modules下是不是已经有了libdb52.dll（如果没有，可以从C:/Program Files/Subversion/bin下拷过来。） 6、搜索C:/Program Files/Apache Group/Apache2/conf/httpd

SVN not working in Eclipse

由 前提是你 提交于 2020-01-10 13:06:12
问题 One day I pressed in Eclipse Help -> Check for Updates (and I learnt that I should Never Ever update a software which works fine.) Then in a project that I used with SVN the whole submenu of "Team" and the little icons that showed that some files weren't commited, they all dissapeared. I tried everything: revert from Instalation History tab uninstall from Installed Software tab replaced the folder eclipse in Program Files with a new one downloaded from eclipse website and tried to install

SVN not working in Eclipse

由 余生颓废 提交于 2020-01-10 13:05:51
问题 One day I pressed in Eclipse Help -> Check for Updates (and I learnt that I should Never Ever update a software which works fine.) Then in a project that I used with SVN the whole submenu of "Team" and the little icons that showed that some files weren't commited, they all dissapeared. I tried everything: revert from Instalation History tab uninstall from Installed Software tab replaced the folder eclipse in Program Files with a new one downloaded from eclipse website and tried to install

Build on commit with subversion

由 妖精的绣舞 提交于 2020-01-10 09:21:30
问题 Simple question. I use Visual studio and I've just installed subversion, how can i force the project to be build with msbuild, and if successfully build commit it else warn the user. I would use TortoiseSVN or VisualSVN or AnkhSVN (whatever it's called) if they have the ability to force build on commit built-in (I know that this is not their usage, I know they are just used as just GUI for committing to SVN) I would like to know if any of these tools can be used to do this extra thing. To

清除目录下的SVN信息

由 旧巷老猫 提交于 2020-01-10 07:17:04
本文转载自： https://www.cnblogs.com/muyou/archive/2011/09/02/2163662.html 作者：muyou 转载请注明该声明。 今天想清除目录下的SVN 信息 ，在网上找了找，说是有三种方法： 一、在linux下 删除这些目录是很简单的，命令如下 find . -type d -name ".svn"|xargs rm -rf 或者 find . -type d -iname ".svn" -exec rm -rf {} \; 二、在windows下用以下法子： 1、在项目平级的目录，执行dos命令： xcopy project_dir project_dir_1 /s /i 2、或者在项目根目录执行以下dos命令 for /r . %%a in (.) do @if exist "%%a\.svn" rd /s /q "%%a\.svn" 其实第二种方法可以用来干很多事的，比如把代码中的.svn替换为任意其他文件名并在硬盘根目录下执行，就可以从硬盘上删除所有的这个文件啦。 3、添加注册表(亲自动手测试过) 可以将“快速删除SVN版本信息”命名增加到资源管理器的右键上，这样，鼠标点两下就能把选中目录下的所有.svn目录干掉了。 代码为： Windows Registry Editor Version 5.00 [HKEY_LOCAL

SVN remains in conflict?

由 爷，独闯天下 提交于 2020-01-10 06:13:15
问题 How do I get this directory out of conflict? I don't care if it's resolved using "theirs" or "mine" or whatever... PS C:\Users\Mark\Desktop\myproject> svn ci -m "gr" svn: Commit failed (details follow): svn: Aborting commit: 'C:\Users\Mark\Desktop\myproject\addons' remains in conflict PS C:\Users\Mark\Desktop\myproject> svn resolve --accept working C:\Users\Mark\Desktop\myproject\addons Resolved conflicted state of 'C:\Users\Mark\Desktop\myproject\addons' PS C:\Users\Mark\Desktop\myproject>
订阅 svn