As I understand it, the command to ignore the content of a directory using SVN is this: svn propset svn:ignore "*" tmp/ This should set the ignore property on the content of the tmp directory, right? In other words, the wildcard is set to be the ignore value on the tmp directory. Trouble is, here's what is happening on my Windows box:...
Do you know a good way to explain how to resolve merge conflicts in git? ...
I am trying to figure out what is the 'grafts' in the Git. For example, in one of the latest comments here, Tobu suppose to use git-filter-branch and .git/info/grafts to join two repositories. But I don't understand why I need these grafts? It seems, that all work without last two commands. ...
When adding a DLL as a reference to an ASP.Net project, VS2008 adds several files to the bin directory. If the DLL is called foo.dll, VS2008 adds foo.dll.refresh, foo.pdb and foo.xml. I know what foo.dll is :-), why does VS2008 add the other three files? What do those three files do? Can I delete them? Do they need to be added in so...
I have a subversion repository with the standard layout, i.e. trunk/ and branches/ (and tags/). When working on a bigger change, a feature branch is used, regularly synced with trunk, and later reintegrated back into trunk (using 1.5 now). Pretty standard stuff. What I am wondering is whether such a feature branch, once finished and mer...
Does anyone know of an application or system out there for tracking changes (files added/removed, diffs on text files) to a non-source controlled directory over time? Something that would let you Take a snapshot of a certain directory tree at time A Come back at time period B and see what has changed Come back at time period C and see...
So, I've been living with my cvs repositories for some time. Though there is a thing I miss - if i rename a file that is already in repository, I need to delete the one with old name from there and add the new one. Hence, I loose all my change-history. And sometimes there's a need to rename a file in alredy existing project. From what I...
Why would you add //Bug 1024 comments into a source controlled code base? Most bug tracking and source control systems are better equipted to keep track of this information. In source control, a label or comment can be used with the checkin. In a bug tracker the revision number can be added to the bug's resolution. So why comment...
Hi I'm using P4COM to communicate with our perforce server. I have written an little utility to simplify our QA of what files have changed from one release to another. I have been using the P4COM interface from Delphi. So far so good. I though it might be nice to allow users to view the diff between the two versions of the file from...
A co worker of mine asked me to review some of my code and he sent me a diff file. I'm not new to diffs or version control in general but the diff file was very difficult to read because of the changes he made. Specifically, he used the "extract method" feature and reordered some methods. Conceptually, very easy to understand but look...
I am trying to plan a way for 5 developers to use Visual Studio 2005/2008 to collaboratively develop an ASP.NET web app on a development web server against an Oracle 8i(soon to be 10g) Database. The developers are either on the local network or coming in over a vpn (not a very fast connection), I evaluated the latest Visual SourceSafe...
Basically I wanted to do something like git push mybranch to repo1, repo2, repo3 right now I'm just typing push many times, and if I'm in a hurry to the the pushing done, I just send them all to the background git push repo1 & git push repo2 & I'm just wondering if git natively supports what I want to do, or if maybe there's a clever s...
Much like it's possible to geotag pictures, I wonder if there is a way to automatically geolocate the code associated with a commit - or any changes - in a version control system like SVN? I couldn't find any information about this and I don't know if for example SVN stores the IP address used by the committers, which in most situation...
Friends/family/etc ask me what I do and it always causes me pause while I think of how to explain it. They know what a software developer is but how can I explain what SCM is in 10 words? ...
What are the best tools (windows) for performing three way diffs on a folder structure? When performing a three way merge do you have to weigh the productivity gains from allowing the tool to make decisions for you vs. the risk of the tool making an incorrect merge? Any experience shared from three way diffs would be appreciated. I'm ...
Can perforce be adjusted so I don't need to "open files for edit"? Someone told me that this was a "feature", and that s/he guessed it could be turned off. ...
When using Mercurial I sometimes find that it is hard to understand the relationship between changesets when there are thousands of changesets, and sometimes ten or more active branches at any one time. Currently, I use hgview which is okay, and while it makes a reasonable attempt to represent the parent relationships it is still basica...
First of all: I am not an experienced ClearCase user, but I have lots of experience with other VCS and *nix command-line tools. WIth ClearCase, I use command-line tool ("cleartool") working in a Unix shell. Problem: I have a small set of sources stored in the ClearCase. Once in a while a fresh .tgz with the same sources comes in and I h...
I am looking into improving the backup process a group of animators use. Currently they back up their work into external hard drives or DVDs manually, taking full copies of everything. The data consists of thousands of high resolution images, project files of various video editing software and sound files. Basically everything is binary ...
I'm looking for a good book that describes how small to medium sized development teams utilize version control, and best practices in terms of development and build processes. If the book relates specifically to .NET, that's a plus, but it can be language agnostic. Any recommendations? ...