Hello, when there are conflicts between the working copy and the repository during updating, I'm using XCode's built in tool FileMerge. How do I save the merged file? What I currently do is save the merged file instead of the original conflicted file. But after saving the merged file and quitting FileMerge, the "svn merge" command does...
So I'm using git and interacting with an svn repo. I have a svn TRUNK that looks like this: A-B-C-D And a svn bug_fixes branch that branches off at commit B or C: -c-d-e-f-g-h-i Now I need to get the cdefghi commits that are in my svn branch back into the master branch. I'm aware that I could just do a squashed commit, let's cal...
Our team had a cvs repository, which we converted to svn via cvs2svn. Our repository has a main branch (let's call in main), that effectively serves as trunk (even though it was technically branched off from trunk far in the past). After the cvs2svn conversion, I branched off main to branch. I made a small change in branch, and then a...
How to setup IIS 7.0 to serve SVN repositories? First of all I need to make possible remote users to checkout and web-based viewing isn't really necessary. I tried to setup WebSVN but got no success: can't set parent folder for a number of repositories, can't switch off anonymous access, can't link non-anonymous access and access list....
Consider the scenario of an SVN server with a dynamic IP: I check out a repository from svn://192.168.1.10/Repo. Then I make a bunch of changes. Meanwhile, the IP on the server has rolled and it's now located at svn://192.168.1.12/Repo. How can I tell my existing checkout to update from/commit to that location? Answer using TortoiseSVN ...
I have a headstrong user who stubbornly insists on committing his binaries (executables, DLLs) into our subversion repositories. I'd go in and delete them, but of course nothing is ever really deleted from subversion. While there are times when we need to commit binaries, I don't want users doing it as a matter of routine. I can set an ...
How, if it is possible, would you use VisualSVN to retrieve source code from an open source project (such as on codeplex), but also have your own SVN repository locally such that you could keep a revision history for your own customizations, but still once and a while check the codeplex project for changes that I might want to apply to m...
I've got a SVN Repository that has moved to a new address/path. However, I've got a working copy with uncommitted source code still pointing to the old (now invalid) repository path. How do you change a working copy to point at a new repository? ...
I want to write a file management system that rely on the SVN. Can I take it for free in the commercial use. or I need release some codes or I need to pay for the license? (My project is a closed source project) ...
I found out that subversion doesn't support symlinks under Windows. I'm wondering if somebody knows a SCM tool that is able to work with symlinks under both Windows and Linux? SCM tools currently missing symlink support under Windows: Clear Case Subversion Mercurial Perforce ...
I have dav_svn installed to provide http access to my svn repos. The url is directly under root, eg mywebsite.com/svn/individual-repo. This setup has been working great for some time. Now, I need SSI (server-side includes) for a project, so I enabled this module with a2enmod include. Now, tortoisesvn can't access the repo; it always retu...
I have a folder structure like this... /main/project/web-app/versioned /main/project/web-app/more-versioned /main/project/web-app/unversioned I mirrored this in my SVN repository without the unversioned folder /main/project/web-app/versioned /main/project/web-app/more-versioned I checked out into versioned and more-versioned, but I...
Is there anything like SVN Monitor for Git repositories? Something that will enable me to monitor checkins and do comparisons. ...
I want to be sure that if I commit something in subversion from one machine and I checkout on another I will get the same value for datetime/timestamp. Currently I observed that the file datetime is from the comment when I did the sync instead of the original value. For me it doesn't make any sense to know when the files were synced - ...
A lot of times I need to delete a folder and copy another one with the same name. Always this is a place to trouble. What is the best way do do this? The error I got when I trying to commit: Error: Directory Error: '..\trunk\bin\MVCContrib\InputBuilderTemplates\.svn' Error: containing working copy admin area is missing Error: Pl...
If I am the admin of a project hosted at code.google.com (in this case http://code.google.com/p/o2platform/) where can I find how much SVN space I am using? and how much do I still have left? ...
I follow a dev=trunk release=branch convention. this works great for the source code but what do ppl do for the documentation (unfortunately it is in MS Word (LaTex is too much for our corporate business/system analysts). do you also keep docs on a branch and merge (it is a pain) after release? or do you keep docs only on trunk? ...
Is there any existing software which can help enforce code review process like below: Dev user commit their changeset with proper comments, but the changeset does not goes into subversion repository directly, it will be pending in a "review software". Reviewer can see all pending changesets in the "review software", review the changese...
HI, I've created a batch file called post-commit.bat and placed it under the /hooks directory. The content of the file is: TestCS.exe The content of the exe file is: static void Main(string[] args) { try { // create a writer and open the file TextWriter tw = new StreamWriter("date.txt");...
Hi, we are starting to use Redmine as our task tracking tool and for some reasons we can't have same SVN and Redmine user logins. How can we map SVN user names to Redmine user names via configuration files or something else. As all commits now are being performed by Anonymous so we can't trac who was the committer for revision. Any ide...