% rails ... General Options: ... -c, --svn Modify files with subversion. (Note: svn must be in path) -g, --git Modify files with git. (Note: git must be in path) What do these "Modify files" options do for me? Edit: It is unclear to me what using one (or both?) of these options actually do...
How do you organize your RPGLE subversion repository on IBM i ? I'm currently working in a travel business company that has a vast amount (about 13k) of RPGLE - sources for their in-house application and finally they want to use version control and adopt a more modern style of coding (the whole WDSC - RDi stuff). So my all-the-time-pr...
I have been using TortoiseSVN, svn, and subclipse and I think I understand the basics, but there's one thing that's been bugging me for a while: Merging introduces unwanted code. Here's the steps. trunk/test.txt@r2. A test file was created with 'A' and a return: A [EOF] branches/TRY-XX-Foo/test.txt@r3. Branched out the trunk to TRY-X...
I have a dev branch that hasn't been touched for a while. I merged the trunk into it to integrate many fixes/changes in the main line since it was branched out, but now I have many small conflicts (merge-left/merge-right). I want the latest trunk revision to be used to resolve each conflict. Is there a command I can run that will resolv...
You know how Subversion stores a copy of every file it has checked-out in the hidden .svn folders? The website I'm building is pretty big (has over 1Gig of PDF files). These PDF files will very rarely change throughout the existence of the website. I was wondering if there was a way of telling Subversion that it shouldn't store a local ...
I use svn:externals to reference several open source projects. I then make some local changes to one of these external projects. Obviously I cannot check these changes back into the external repository. How do I keep these changes in my repository while still maintaining the ability to easily incorporate external changes? Git makes this...
Does anybody know good illustration for basic Subversion usage? Something like images in this directory: http://www.ivy.fr/mercurial/ref/v1.0/ (they are for Mercurial), single image illustrating most common actions. ...
I personally used Mercurial and Subversion in a limited way and I just can't see why 95% of the people will chose SVN over something else. Is it just a monopoly case or is there a lot of good hidden in SVN that other systems don't have? ...
I've got some directories that have been moved or renamed. The Linux command line SVN client ignores these directories. The TortoiseSVN plugin for Explorer shows them. If I delete them and update, they come back. All of the file movement and deletion has been done using the Linux SVN CLI tools. When doing an 'svn update' or even a fresh...
What is the best way to make one of the branches of a subversion repository the new trunk? There has been a major rewrite for the entire system: things have been moved around, rewritten, replaces, removed, renamed etc. The rewritten code has been tested and is ready to replace the old trunk. Basically, the the old mainline (Trunk 5) ...
I'm trying to embed my Subversion revision number in a C++ project and am having problems setting up GNU make to do so. My makefile currently looks something like this: check-svnversion: ../shared/update-svnversion-h.pl ../shared/svnversion.h: check-svnversion shared/svnversion.o: ../shared/svnversion.h .PHONY: check-svnversion ...
I'm administering a svn repo for a project where the source wasn't imported with a single top level directory. As a result, there are about 15 separate 'projects' instead of one. How can I merge these into one folder while maintaining the change history? *hint: svn move doesn't work in this case. [edit] whoops, dupe of http://stackover...
I'm looking for something like: svnserve stop ...
I would like to know how to setup an SVN repository with LDAP authentication. I do not want to use Apache DAV though. ...
I am able to create the same SVN branch twice. I would hope that SVN would not allow me to create same branch again. Please help me to fix this issue. ...
I have a SVN Repository at my main PC, to which only I have access. I also have a Laptop, and I don't want to lose SVN Functionality when I am not connected to my PC. So at the moment, I simply copy accross the whole Repository to the Laptop and copy it back. That works well of course (I am the only developer, so there is no access to t...
I have a repository with a bunch of folders, and I want certain developers to only get two or three of those folders when they do a checkout on the repository. How can I make the folders not show by default, and then add them only as I want to grant access. I'm using VisualSVN for the SVN server, and what I have done is given read acce...
I love TortoiseSVN, as I'm sure many do. we've fairly recently moved to TFS at work, and I find myself wanting Tortoise for TFS. I tried the TFS Power Toys ( I'm running under Windows Server 2003) but no icons turned up). Is it a vista only thing? Is there a way to get TFS to expose SVN urls like codeplex does? ... i've tried svnbrid...
Example: $ svn copy foo.txt bar.txt A bar.txt When would you use this technique, and why? Will this command (taken from svn's "red book") creates a copy of <foo.txt> while preserving the history of it to be shared with <bar.txt>? If I'm changing <bar.txt>, what will happen to <foo.txt>? What are the equivalents to thi...
I am pretty much the only person making check ins to the svn repo but for some reason over the past week Tortoise is reported that my WCF Service Reference directory is 'obstructed' and I cant commit my changes. If I have no even made any changes to the contents of that directory, why does svn report obstructed and what does that even me...