SVN’s merging capabilities are decent, and the simple merging scenarios work fine – e.g. release branch and trunk, where trunk tracks the commits on the RB. More complex scenarios get complicated fast. For example lets start with a stable branch (stable) and trunk. You want to demo a new feature, and prefer to base it … Read more
This has recently become much more straightforward with the command svndumpfilter. Details are available in the subversion documentation here. Basically, to avoid conflicts (explained here), it takes a repo dump and redoes each commit, either including or excluding a given file prefix. Basic syntax: svndumpfilter exclude yourfileprefix < yourdump > yournewdump Exclude is probably what … Read more
There have been a few answers that can work: Create a pre-commit hook script that reject the commit when a specific property is being added. You can then add this property to files in the working copy to prevent commits. TortoiseSVN will exclude files in the special changelist “ignore-on-commit”. However, this is not honored by … Read more
What’s going on here: Git is optimized to switch between branches as quickly as possible. In particular, git checkout is designed to not touch any files that are identical in both branches. Unfortunately, RCS keyword substitution breaks this. For example, using $Date$ would require git checkout to touch every file in the tree when switching … Read more
There’s nothing in particular in DVCSs that makes merging easier. It’s simply cultural: a DVCS wouldn’t work at all if merging were hard, so DVCS developers invest a lot of time and effort into making merging easy. CVCS users OTOH are used to crappy merging, so there’s no incentive for the developers to make it … Read more
As with many aspects of svn, tortoise makes it really easy. In fact, I believe tortoise actually adds features by using existing svn features in a systematic way. I realize this answer is windows only, then, but perhaps some people out there are like me and still use windows. In the “Check for Modifications” popup … Read more
It is possible to manually identify a file located within a repository as binary by using: svn propset svn:mime-type application/octet-stream <filename> This is generally not necessary, as Subversion will attempt to determine whether a file is binary when the file is first added. If Subversion is incorrectly tagging a certain type as “text” when it … Read more
I had to dig into this issue too and found the following pages which lead me to the solution: – http://comments.gmane.org/gmane.comp.version-control.subversion.devel/117844 (See especially the link to “Julian’s patch”.) There is stated that the “OPTIONS of <url>: 200 (<url>) OK” error is quite misleading and often just means that the repository URL is wrong.
You’ll need several steps. supply proper trunk, branches and tags folder names and fetch svn repo: git svn init -t tags -b branches -T trunk https://mysvn.com/svnrepo git svn fetch Since tags in svn are real branches, create git tags from tag branches: git for-each-ref –format=”%(refname:short) %(objectname)” refs/remotes/tags | cut -d / -f 3- | while … Read more