I have a whole bunch of pairs of files that have subtle differences. We use subversion for a source control, and I like the Merge/Diff utility that comes with TortoiseSVN for windows. And I can use this utility to manually compare/merge two files together. My question is this: How can I programmatically merge two files together the s...
So I have a project on a remote file system (that I have been editing via ssh). Now I need to copy the project onto my hard drive. I don't really need version control on the project anymore, so this makes me think that I should svn export the project. But there are files that haven't been checked in yet, that I need to preserve when I ma...
I have added the JSON-framework (Stig B - Google code) to my Classes folder (just the JSON directory as per option 1 instructions). I had subversion set up which was working fine, until i added this directory. If I modify any existing files that were in the repository, they get marked as M and i can commit those, but i cannot commit th...
We have super computers that researchers/scientists run simulations and tests on. We would like them to be able to easily check their code and results into a version control system. The first thing that came to mind was Subversion, but I have heard of others such as Bazzar, Mercurial and Git. Which would you recommend, based on the fol...
I have a development team working on one SVN repository and another team working on another SVN repository. The projects are similar but slight different hence 2 development servers. Occasionally I would like to push and pull some features from one team to another. Can Git do the job? Any suggestion on how to go about it? (Git beginn...
I am working with a legacy VSS repository which was transferred over to a new SVN repository a few months ago. In the meantime, before we go live with the SVN repository, we need to bring over all the changes that have happened on the VSS one between then and now. I was looking at different ways to do this which seem to be things such ...
I've just started working for a new firm as an in-house web developer. Up until now they have been outsourcing development work of their websites and decided to bring them in-house, hence my employment. I've only every worked on projects on my own and have never used version control. We've just hired another web developer to work along...
hi all i've encountered some problems which i can't resolve. Any help is really appreciated. my customer uses mac and pc. tortoise on pc, scplugin on mac. when mac creates new directory, adds it to repository and commits it pc user can't update to the new version. The error is "Can't create directory /.svn. The System can't find the p...
I'm currently in the process of setting up SVN on our local development web server and want to know if I should create a repository for each website on the server or a single repository that contains sub-directories for each site? Thanks for your help. ...
How do I stop Subversive from setting svn:mime-type to text/plain on initial commit? My Java code is being checked into my repository with the svn:mime-type property set as text/plain, and as a result my web-based SVN viewer (trac) isn't syntax highlighting. edit: I should add I'm running Eclipse 3.5 and the most recent version of Su...
Hoi, I try to hg pull from my private repo on Bitbucket.org into my local repo on my Windows machine from behind the company proxy that requires Windows authentication. I found the proxy server and port (Internet options of IE) I found the settings Mercurial.ini file in my %USERPROFILE% I added this section to it (info): [http_prox...
Is there any way to delete file from svn repository including all its history? This issue emerges when I want to get rid of large binary file residing in repo. I know only one approach that might help in this situation: Dump all repo with the help of svnadmin utility. Filter dumped file with grep. Grep should use filename and write i...
As a freelance developer, I like to keep all my development in my own SVN server both for continuous integration as well as book-keeping as to what changes were made and when. I am now working with a client who also uses SVN internally and would obviously like me to work with their development team on their SVN server. This is great i...
We have the following tools in place: Subversion (Version 1.5.9) Polarion (version 3.2.2) Polarion is based on Subversion, so on every action that changes anything (which is often the case), Polarion will use a Subversion commit to change anything. All things are currently stored in one and only one repository, so every commit of eve...
I have created a branch called "feature3" from my trunk. I make zero modifications to files on the "feature3" branch. There are also no modifications to files on trunk. Using TortoiseCVS (TortoiseSVN 1.6.6, Build 17493 - 32 Bit) against a SVN (version 1.6.3 (r38063)) repo, I initiate a "Merge" with the "Reintegrate a branch" option se...
I dumped my repository svnadmin dump repos > repos.dump then I loaded it on the new machine svnadmin load newrepos < repos.dump and when finished the new repository is missing the last few hundred revisions. Can I inspect repos.dump to see if it is missing the revisions? Can I dump the missing revisions and load them onto the new ...
Scenario is to use a source code repository as usual except at periodic intervals, take a backup of the delta changes and copy them over to a remote location which should bring it to the same state as the source, the reverse should also apply assuming that no new changes have been committed to the 1st instance in the interim I hope this...
I have the latest revision checked out to my working copy, but it's broken - it can't compiled. How to get the previous revision before the head? And if it's broken too - the previous before the previous? ...
I have a python script to download source code from a list of repositories, some of them are big. Sometimes, svn hangs in the middle of a check out. Is there a way to watch over svn process, and so I know it is hang or not? ...
How discard local project from repository in IntelliJ IDEA 9? (like eclipse), help me :) ...