This is a problem I've come across for a couple different projects I'm working on. Since the projects are still under stealth development, and the problem itself is of potentially broader interest and agnostic to them, I'm going to anonymize it - but FWIW, I work primarily with Ruby/Rails and MySQL. Scenario I want to have a system f...
In addition to my Previous topic on How to use SVN, Branch? Tag? Trunk? I would like to get in-depth on how a programmer should/could use TFS. The things that are most interesting to me is not how to set up the server, rather how you use it on a daily basis. In the area of software engineering where your responsibility not only l...
Long story, made short: I have the following in my git status and need to get rid of the two plugins below: # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # unmerged: vendor/plugins/pluginA # unmerged: vendo...
Hi, I'm going through the process of setting up SVN on my remote web server (Linux Centos), and I'm needing a bit of help to make sure I do it correctly. So far I've installed SVN and used svnadmin create to set up a repo at /home/repos. The plan would be to set up projects within /home/repos e.g /home/repos/project1 etc. I've also edite...
Hi, we are 5 developers working in an svn environment. every programmer can work on small bugs and commit whenever he wants. after the work has done, i want to give them the way to deploy to the production without considering the other programmers and their deployment. for example: while i am committing, other user is committing too but ...
I've got a repository on GitHub (http://github.com/hrickards/PHP-Crypto) for a little project me and a couple of others are working on. My development environment is Aptana Studio, and I use the EGit plugin as Aptana is basically Eclipse underneath. Today the designer sent the HTML and CSS for the website with the images in a folder name...
whats the best distributed version control for a group project of 2 people coding on windows? ...
We'd like to use git to maintain system configurations. Because sometimes configuration data exists outside of /etc, we've started doing something like this on our systems: # cd / # git init # git add etc # git add some/other/path # git commit -m 'initial import' And so forth. This works, up to a point. As long as your cw...
Everytime I start a project I have to think carefully about which files to exclude from source control. Has someone made a list of the criteria so I can look it up from the beginning? I work on my own so I have not got round to it. I appreciate that in the case of a DLL, you would want to include some and exclude others, so it is not jus...
I am a lone developer. We have a couple of websites hosted on a web host. The svn repository is also on the web host. In house, we have a development machine, which is a close-enough replication of the live environment. For the live website, I have an export from subversion, appropriately named with the version number. The live website'...
At my job, the assembly version of each project in the source control is kept to 1.0.0.0. When the build machine make a new daily build, it has a task to update the assembly version but does not check in the updated assemblyinfo.cs. So on our dev machines, the assembly version of the dlls we are compiling are always set to 1.0.0.0. Is i...
What is the best version conrtol application? I'll setup it to my Windows 7. I have installed WAMP. So it could be eider Windows 7 application or PHP application. And my purpose is to manage / version-control PHP files only. Thanks in advance!!! ...
Hello, I'm a junior developer and recently started working for a very small office where they do a lot of in-house development. I have never worked in a project that involved more than one developer or were as big and complex as these ones. The problem is that they don't use all the tools available (version control, automated building,...
Is there a good way to export a set of nodes from one Drupal installation, including node revision history, and then to merge these into another Drupal installation, including revision history? I'm familiar with modules such as Node Export and Backup and Migrate... But Node Export doesn't preserve revision history, and Backup and Migra...
In have entities: Collection and Item. Each collection has many items. Both Collection and Item can be edited collaboratively by all users of the application. I have to provide a way to undo changes. Versioning Item records is straightforward, the difficult part is to version the relation between the Collection and Item. The allowed op...
What command can I use to print out the commit id of HEAD? This is what I'm doing by hand: $ cat .git/HEAD ref: refs/heads/v3.3 $ cat .git/refs/heads/v3.3 6050732e725c68b83c35c873ff8808dff1c406e1 But I need a script that can reliably pipe the output of some command to a text file such that the text file contains exactly the commit id...
Many times I'm making two different changes to files in my repository, I want those changes to be treated as two consecutive commits. For example, in repository prog.c prog.h README.txt While fixing a bug prog.c and prog.h, I fixed a typo in README.txt. Now I want to commit the change to prog.c with its own commit message, and the c...
Some of our customers ask for end-user documentation in a format that’s suitable for printing. Currently, I use Microsoft Word 2002 to write the documents and a non-free PDF printer to generate a PDF file with searchable bookmarks. Then I store both files in the Subversion repositoryT. While it does the job, it has a few drawbacks: It ...
When you place a Rails project under version control, do you exclude anything? Log files, for example? ...
I edited my .gitconfig file to add support for LabView and it appears that I did something that Git doesn't exactly like. The problem is it (Git) doesn't tell me what it doesn't like. What did I do wrong? The error message doesn't help much either: "fatal: bad config file line 13 in c:/Users/Tanner/.gitconfig" [gui] recentrepo = C:...