At least two brilliant programmers, Linus Torvalds and Guido von Rossum, disparage the practice of putting keywords into a file that expand to show the version number, last author, etc. I know how keyword differences clutter up diffs. One of the reasons I like SlickEdit's DiffZilla is because it can be set to skip leading comments. ...
I know you can use source control software for source code, but can you use it for your technical documents as well? For example, can you store a Word document and it keep a history of changes (I know it has track changes, it's just and example)? Thank you. ...
What is the maximum revision number supported by SVN? The repo is of type FSFS, hosted on a Fedora box. Thank you, ...
Normally projects consist of a set of non-source code files like interface images (PSDs, JPGs,...). How can we managing these types of files with TFS and how graphic designers can check-in or out their image files to use them in applications like Photoshop? ...
Where I am: Linux command line The problem I have now: Sometimes I couldn't make atomic commits(consisting all the modifications required for one particular ticket/task), because we have some files in the repository, which contents vary at local dev environments. For example: database.xml(dbname, username, password etc.) I modify this...
i have setup my project in SVN to use an external library. When i want to push some modifications to the live server i do a diff between versions and copy only the changed files. My problem is that the diff does not check the external modifications also, it justs returns the project modifications. What is your strategy to deploy modifi...
I'm using a large (thousands of source files) public project with minor (a dozen source files) local modifications and additions. The local modifications aren't relevant to other users of the big project. The project uses svn, as do we for our own projects. I want to be able to get the updates from the project when it is updated and i...
I want to merge two branches that have been separated for a while and wanted to know which files have been modified. Came across this link: http://linux.yyz.us/git-howto.html which was quite useful. The tools to compare branches I've come across are: git diff master..branch git log master..branch git shortlog master..branch Was won...
I'm a newbie developers and building an application with 3 other remote developers. I've only worked alone until now, and now I need a way to share my source code with the other developers on the project. All of the project sites out there (SourceForge, Codeplex, Google, etc) seem to be aimed at Open Source development I'm not interest...
My team is looking to migrate many of our tools (SCM, bug-tracking, builds, testing) to TFS. We're considering moving each system in stages. For example, move source control first, bug/feature tracking next, etc... Since we have to choose a process template to use source control (or anything in TFS) how locked in are we with the decisio...
What is the best-practice for maintaining a source code repository that automatically (or, at least, by default) rejects the inclusion of /bin, /obj, *.suo, etc. files? Should each developer be required to set a "global ignore" pattern list for their SVN client installation? [This seems too broad of an exclusion.] Or, should the sourc...
I'd like to partly automate creation of GNU-style ChangeLog entries when working with source code in version control. The add-changelog-entry-other-window works with one file at a time and you have to visit the file to use it. What I'd like to see instead is to have some command that would take an output of diff -u -p (or have integrati...
What is the best way to share source across local machines? I'm working on a cross platform project with an svn repository. I perform a checkout on one platform (perhaps osx), and make changes. I must then test my modified code on other platforms (xp, vista, ...) BEFORE checking it in. Manually copying files between machines or runni...
I hope this qualifies as programming related since it involves how to structure a project. Because I've always used the web site model with VS.net I never had solution and project files and putting everything into source control worked great. I knew that everything I had in my web site directory was all I needed for the web site. Now ...
I am looking for a good source control solution. Here are the requirements: Must have a GUI or have an available GUI plug-in. Must be free. Must work with HTTP. What source control would you choose? BACKGROUND Our .Net development team is part of a large parent company. We're in the process of acquiring VS Team System, however the ...
Using Visual SourceSafe's "Open SourceSafe Database..." command, there is an option at the bottom of the dialog to "Open this database next time I run Visual SourceSafe." Typically, when checking this box the most recent opened VSS DB is opened immediately upon launching VSS (even if it's a second instance of VSS running). I'm seeing t...
I'm using C# and VB.NET. I often (every days...) add comments to existing source files. When I check-in these files, I would like to have my merge tool to ignore any changes made to comments - I just want to be sure that I did not change the code. I use WinMerge and Team Foundation Control Server (yes, no chance : Subversion was not a...
What would possibly cause a 'git push' to try and commit to two branches? I have my own branch I'm working on, which is on the shared repo... and a master branch. Right now I just wanted to push to my personal branch which went through just fine, but it also tried to push to master and got rejected. Looked something like this: foo$ git ...
I'm used to using TFS, and my company is now switching to SVN for a new project (the main reason is to better incorporate our java & .Net codebase under the same source control). I am given to understand merges in subversion are hard (Jeff mentioned this in his latest podcast). What are the problems with subversion, when compared to ...
Tortoise SVN will not let me access an svn repository that has a self signed and expired ssl certificate. Is there a config somewhere to tell it that I want to trust that certificate anyway? ...