I am trying to get subversion to default to bbdiff for comparing files but I cannot get it to work properly. The ~/ .subversion/config doesn't seem to like this line diff-cmd = bbdiff --resume --wait It looks like 'diff-cmd' is a path and not a command It half works with the following diff-cmd = bbdiff It opens the 2 files but I d...
The Situation I have a pretty large Subversion repository that I am trying to backup efficiently. The repository size is about 6 GB and growing. Some large commits are around 500 to 1GB in size. I am trying to backup this repository to an off-site location, through an Internet up-link. Explaining the sheer size of it To whomever i...
Let me start by describing what our current 'process' is and then ask you how we should improve on it and what, if any, tools you would suggest. What we are doing currently Every time someone makes a commit to our svn (or pushes git changes into 'trunk') it ends up in an email in one persons inbox. That person is responsible for glanci...
Hello, svn 1.6.9 I have my development (dev) machine and a target testing machine (test) However, If I make some changes on my dev machine, that should cause a conflict on the test machine when I update, as I have modified the same line code in the same file. example (dev) main.c void get_device(int device_id); (test) main.c vo...
In Java, we can declare a static string with the value of $HeadURL:$ that is updated by every Subversion commit. This can then be extracted from a produced class file to find the source file that corresponds to the class file(and revision information). In C we can declare a static char[] to do the same thing. What is the recommended w...
I have a monolithic trunk which is comprised of many projects and their corresponding shared modules. I wish the database was organized in a more flexible manner, but it isn't. What I'd like to do is create a branch which is a sort of project-specific refined view of the trunk. Really, it's a tag, because I only want to write it once ...
how do I get the first 10 entries on svn log for a file svn log myfile.php thanks ...
I just started a new position where none of the code is in version control. One of my duties is to fix that. I have some space on a SuSe 10 box, and subversion 1.6 is installed. Following the instructions in the O'Reilly Subversion book, I've got a subversion repository with code in it, and svnserve running: #lsof -i :3690 COMMAND P...
Not everyone I work with has subversion configured the same way. Every once in a while I have to make sure that all source files have the proper eol-style and keyword expansion set. It would be much easier if I could just fail the build if someone commits code without configuring subversion properly. Is that possible? EDIT The build us...
I've got a Windows 7 machine upon which I do both PHP/MySql Dev, and .NET/C#/Sql Server coding. Due to a recent re-install, I thought it might be an ideal time to try and keep my machine a bit cleaner rather than install both Apache and IIS, etc. I installed VirtualBox, with Ubuntu 10.04 as the guest OS, with the plan to move my PHP ...
Hey guys I’m looking to move over to using git to make my EE development a lot easier and more manageable. I’m already aware of the guides posted on devotee and a few othersites but after scanning over them they seem a little old and seem to be specifically for ee 1.x, I was wondering if anyone had been successful with ee 2. I’ve only r...
I'm using Subversion for version control. Is is possible to navigate through the diff changes (default blue), added lines (default green) and deleted lines (default red) via shortcut? So just as you can navigate through document bookmarks, is it possible to navigate/scroll through all changes found by Subversion? ...
I've used SVN for about two years now (mostly via TortoiseSVN and IntelliJ), and experimented with git (mostly via TortoiseGIT ... detect a pattern here?) Our company is using SVN for the repository, and they're not thinking of switching any time soon. What is the recommended best practices and tooling to use git locally and work with t...
I need to outsource some programming. I was thinking of setting up a computer the programmers could Remote Desktop into with a full test environment set up on that computer. I have never used subversion and was wondering if I could give them access to only certain modules so that could not even see the code to modules they did not need...
I'd like to be able to tell svn to automatically add new files to a default changelist, mostly as a workaround to svn's lack of a "no changelist" filter. Is there an official way of doing this? I can write a little script to do it, but if there's a way to do it that will integrate well with the command-line client, I'd love to know about...
I currently have a NetBeans php project setup to sync from my user directory to a different local directory /var/www/myproject . This works great when I'm developing locally (adding, deleting and changing files). The problem occurs when I do an update from source control and pull down changes from another developer. NetBeans does not ...
If I wanted to see how productive I had been over a 6 month period is there any commands or tools I can run over a SVN repo to get this kind of information? by user (so I can filter to myself) I would like to see things like lines committed by me lines removed by me some kind of churn stat etc... Looking for an easy method. ...
I want to share my code libraries between multiple PHP projects. I am using SVN (unfortunately). What other options are there to share code besides using 1) svn:externals or 2) a shared repository checkout + paths in config files? My objections to svn:externals are: 1) Mercurial does not have this, and I prefer that; and 2) it is easy ...
I'm trying to make the move into version control, as my projects are getting larger. Currently my development goes something like this: I have the "live" version hosted online I have a local version, as well as a local webserver I edit the local version and do testing on my local webserver Finally, I'll run Unison which updates the liv...
So, I have some old versions of the code from before we set up version control, and I want to use the repository to hold them, first because I still will (not might) need them for some things, and second as an archival method. What is the best way to add and tag an obsolete version into the svn 'stack' without disrupting the versioning a...