Let's say I have a file A.cpp, and I notice an error on line 15 of the file. Let's say the error is a "const" on a function that returns a pointer to a member variable, meaning using const on the function is technically correct but semantically wrong. I would like to discuss the semantics with the author who made the change. Using git,...
How do I get a non-versioned copy of an older version of a file from a mercurial repository? Edit: I have changed somefile.png (binary file) in my local copy. I am looking for a command which will allow me to get an earlier version of somefile.png so that I can compare it with my modified copy (using an image viewer) before I commit cha...
I've used iPhone SDK and tools for several months. XCode seems pretty nice, but there is one tool which I don't get: FileMerge. How can anyone use it for comparing files or doing merge? Seriously now, what do you really use? My use case is subversion database on remote server, few local developers working on same project as well as few...
Hi - I'm trying to dig up resources on how version control algorithms operate on data, and I'm especially interested in the way git's mechanism operates. I realize git does many different things, but in particular I'm interested in how history is saved and restored. I'd appreciate any links or article references anyone can point me to. ...
I wrote an application a while back and have been maintaining it for a while now, but it's gotten to the point where there's several major new features to be added, a ton of changes that need made, and I know quite a few things I could do better, so I'm starting a rewrite of the entire program (using bits and pieces from original). My q...
Is there any reason to not use Time Machine over Subversion (on Mac)? I've been using both Versions and Cornerstone trials. Neither can resolve merge issues. With svn 1.6, you have the impossible tree conflict. If you get that, forget it. I continually have tree conflicts and file conflicts but no way to do anything about them. My ...
Suppose I have a file "ChangeLog" in branch "master". I want to record information about all changes in any branch in this file (in more detail than in a commit message and with other descriptive information). I git checkout -b revA, perform edits, update ChangeLog and git commit. I then git checkout -b master. This checkout will rep...
I would like to have vc-diff colorize the output so that added lines are in one color and deleted ones in another. Using Emacs 23.1 and putty/xterm-256color (list-colors-display shows 256 colors and color themes and such works as expected). This is how it looks right now: ...
Hello all, I'm having a discussion with the management about Subversion practices. I've asked them to tell the administrator to configure our Subversion repository so it's possible to change the commit comments afterwards, in case I missed something even of the proof-reading :-). My arguments are, Log messages which needs to be impro...
Possible Duplicates: Source control system for small database dev team good version control software for Delphi 2009 We are a small team of 4 developers and need a good version control system for use in-house. 2 of the developers work remotely from home and 2 mostly in the office. We are Delphi developers so would like somet...
Almost any IDE creates lots of files that have nothing to do with the application being developed, they are generated and mantained by the IDE so he knows how to build the application, where the version control repository is and so on. Should those files be kept under version control along with the files that really have something to do...
We're finding ourselves unable to open our project in Visual Studio because SVN is adding lines like "<<<<<<< .mine" to our .csproj files. This is apparently something SVN inserts when it has trouble merging files, but we're not interested in merging things as two people can never have the same file checked out. How do we set Visual ...
If it is possible to auto-format code before and after a source control commit, checkout, diff, etc. does a company really need a standard code style? It feels like standard coding style debates that have been raging since programming began like "put the bracket on the following line" or "properly indent your (" are no longer essential....
I'm offline (well, to be exact my svn repository in unreachable right now), but I have a fully fledged working copy on which I am, well, working :-) Now I need to know the revision number of a file. How can I check the revision number of a particular file (which by the way doesn't have the svn:keywords property) while being offline? I ...
In our application we often need to rename a file/package on a release branch and then merge this change (along with many others) to the trunk. A big problem is that many SCM solutions (our current is SVN) do not track file renames. When we go to merge a release branch of our product back to the trunk it becomes easy to lose these chan...
What's the most painless way for the Visual Studio developer to start using GitHub? Ideally the answer would involve a Visual Studio plugin, or some other integration app? What solutions are available today to view/update GitHub repositories? Can you rely or expect the same functionality as compared to other VS integrated source contr...
There are a bunch of file in the history of my hg repo that have been removed. They are causing the repo to get pretty big (several of them are images, and sql dumps from early in the project, among other things that never should have been comitted in the first place). How do I get mercurial to forget about that stuff and get my reposit...
Due to lack of Mercurial support in several tools, and managerial oppression it has become necessary to convert several trial Mercurial repositories to Subversion in order to conform with the company standard. Are there any tools or suggestions for how to achieve this without a loss of revision history and the like? ...
Hi, I've read a number of topics in the same sort of ballpark as this one, but in all honesty I'm still not exactly sure on the best approach (as a starting point). I am a solo developer in a small office and I have around 30 websites which are hosted on a linux VPS. I want to start using using version control (probably SVN) and also set...
Hello, I would like to run all my django tests using mercurial's precommit hook. Whenever a test fails the commit will be aborted. The goal is to block build-breaking commits as often as possible. edit: Ended up using the external script route. Here is the reletant portion of my hgrc: [hooks] precommit = python ./pinax/projects/lgr/m...