Hello, I would like a specific string in a specific file to be hidden every time I commit changes to that file. Actually, I have a URL in a file that shouldn't be public in a remote repository. Is there anyway to hide it using pre-commit and post-commit hooks or something similar? Currently I am working with a git repository but it w...
We're about to start development of a number of reports using Jasper Server Reports version 3.7.0 CE. Does anyone have any recommendations as to how best to manage version control with this development, given that the structure of the report units is managed in the database and through either iReport or the web front end? In fact you c...
I installed Tortoise Hg(mercurial) on my box. I then installed Tortoise SVN on the same box. When I go to a folder and try the RIGHT MOUSE , I see the menu entries for "Tortoise Hg" and Nothing from "Tortoise SVN". What gives ? What can I do to make both co-exist peacefully ? It will be a nice idea if both the teams work together and c...
Hi, I'm having a bit of a struggle trying to get SVN correctly set up on my Linux (Centos 5) VPS. I have EasyApache compiled with the mod_dav module enabled, but I'm struggling with where to go from here. This is my current set up: Centos 5 server Subversion 1.4.2 installed (via yum) SVN repos located at /home/repos I want to access ...
What do I need to add apart from the obvious (src, dist) to my version control system from a NetBeans Java project directory? Can I drop the entire build directory? Should I add the nbproject directory as I'm working on the same project on a different machine as well? I would like to drop at least the build directory because anytime the...
Hi. I would like to merge from FeatureBranch to master, without doing ,,checkout master'' first. I've tried (being in FeatureBranch) git push . master but I got (to a degree of surprise) : Everything up-to-date Despite having commits in FeatureBranch which are not (yet) present in master. The reasons why I desire to be able to do...
I've got a question that most likely doesn't have a unique and clear answer. In the team we are using the SVN, many of the people are using the git-svn (treating it as a fancy SVN client). We're storing some project related publications, reports, documents in the repository under let's say trunk/Documents/*. Each of the users creates h...
Coming from a UNIX background, with some knowledge of CVS and git, I have gotten my Windows development skills up in just about every area. But I still have no idea if there is a single VCS that Windows devs "have" to know. Is there one used above all others? ...
I have a need to code from two computers during the week. What is the best way to sync the two computers (mac)? I've started using source control, like SVN. It works pretty good, except sometimes I check in code that I want to sync but they don't compile and it interferes with other people on the team working on the same project. I don...
I'm new to XCode and I find the file management a huge pain. In most IDEs, you can simply have the project source tree reference a directory structure on disk. This makes it easy to add new files to your project - you simply put them on disk, and they will get compiled automatically. With XCode, it appears I have to both create the fi...
I have an old pet project I want to revive (haven't had enough time for it last year - small kid - you know) - so restored old copy of my dev folder from archive, but since I have rebuilt my machine since when - I can't remember what needs to be done now. I installed the latest version of TortoiseSVN, and the existing directory structure...
The title says it all. The default cmd.exe is horrible, I'd like to use, say, the "Console" shell. ...
Are there any source control systems that require another user to validate the source code "before" it can be checked-in? I want to know as this is one technique to make sure that code quality is high. Update: There has been talk of "Branches" in the answers, and while I feel branches have there place I think that branchs are somethin...
If I have a procedure definition that has been stored in source control, is it necessary or helpful to keep the 'tombstone' up to date as well? Here's what I mean by a 'tombstone': CREATE proc [dbo].[getCreditTransactions] AS /* 2001-02-12 jdoe : created proc 2003-04-15 kdoe : added handling for credit business rules */ etc...
Can I create app.config or web.config file that applies only to my developer machine, as opposed to using the default configuration files that are checked into source control? ...
Hello, My situation: I've recently joined on the front-end side of an established project that involves a growing number of instances of a rails app, each of which which differ in some aspects (views, styling, settings etc) but which all share the majority of their back end code. Our Git repo has a number of branches looks something l...
A group of developers that I am working with switched from VSS to SVN about half a year ago. The transition from CheckOut-CheckIn to Update-Commit has been hard on a number of users. Now that they are no longer forced to check in their files when they are done (or more accurately, now that no one else can see that they have the file chec...
In our case we want to igonore changes in code comment headers for generated code. In Visual Studio, we can change the merge tool (GUI that pops up) and use a 3rd party tool that is able to be customized to ignore changes (http://msdn.microsoft.com/en-us/library/ms181446.aspx). Great, so a file comparison no longer highlights code commen...
Hello world! I am looking for a set of nice plugins to use when developing software. Currently I am soloing a project where I simultaniously experiment with TDD as I go through the project. Recently I have been quite hyped about agiles processes and wonder how I can further integrate tools that will aid in my task of both completing the...
I can't svn up or commit. :( There is a svn centrally and I use git locally using git-svn. Basically, somehow, I added a folder that had .svn folders into the git and committed it to svn. Both git and central svn happily committed the .svn as the content folder, without complaining. Now, I can't svn up to the existing folder as, once ...