version-control

git without bash/cygwin

I'm on a vista laptop, trying out git for the first time. I installed the msysgit version, and it installed a "git bash" shortcut on the desktop. When I run it, it seems to run in a cygwin kind of box, where C:\ is /c/ Is it safe to use git from the windows command line where /c/ is C:\? does that create any conflict with the way git e...

How to edit incorrect commit message in Mercurial?

I am currently using TortoiseHg (Mercurial) and accidentally committed an incorrect commit message. How do I go about editing this commit message in the repository? ...

Git and Trac (or similar)

In the past I have really enjoyed using Trac with subversion repositories hosted on some of my own servers. The integrated ticketing and online code browsing is very convenient. I have used github for some of my public projects but I don't have the money to shell out for an extra service, espcially when I am already paying for remote V...

msysgit on windows -- what should I be aware of, if any?

This is related to another question I asked recently. When installing msysgit, the installer presents 3 options related to system path: Never change windows environment. With this option, you have to use the "bash" shell to work with git. Add the git\bin directory to the PATH environment variable, but without overriding some builtin w...

How do I run one version of a web app while developing the next version?

I just finished a Django app that I want to get some outside user feedback on. I'd like to launch one version and then fork a private version so I can incorporate feedback and add more features. I'm planning to do lots of small iterations of this process. I'm new to web development; how do websites typically do this? Is it simply a matte...

Is version control possible on a shared host w/o shell access?

I have a client who's host doesn't allow shell access. Is there any multi-user revision control system that can work in that situation (on linux)? He's reluctant to switch hosts. ...

What is the best solution for migrating Linq DBML tables?

I'm trying to figure out the best way to deal with database updates with Linq. I'd like a clean way to checking database changes. I'd like to use a ruby style migration scripts, but I'd also like to keep everything in sync with the DBML file. What is the best way to do this? Do I need to write a custom solution to do this? ...

Version control approaches in Scrum

Recently with my coworkers we were discussing how to organize the version control in a Scrum project. More specifically, the criteria for branches creation (per developer, per task, per Story, per Sprint?) and the methods of integration. My opinion was that a useful way to organize it is to create a branch for each User Story, so you c...

DBML changes & source control

Hi all! I'm having some issues with the DBML. Every time the team needs to synchronize changes into SVN, the DBML is changed which generates lots of conflicts. This seems to be related to some rearrangement in the dbml editor, because most of the associationConnector sections in the .dmbl.layout seem to change during development if you ...

Unable to start analysis services for sql server 2005 sp2

I'm trying to install Team Foundation Server & need to get SQL Analysis service running but it wouldnt start. This analysis service belongs to a named instance (TFS). Gives me the following message - The SQL Server Analysis Service (TFS) service on Local Computer started and then stopped. Some services stop automatically if they are no...

Automatically fetching latest version of a file on import

I have a module that I want to keep up to date, and I'm wondering if this is a bad idea: Have a module (mod1.py) in the site-packages directory that copies a different module from some other location into the site-packages directory, and then imports * from that module. import shutil from distutils.sysconfig import get_p...

How do I use version control tags?

I have developed a kind of brochure website template that I base most of my clients' websites on. The template and derived sites are stored together in a Subversion repository. Bleeding-edge (but stable) code lives in /trunk; and each website has its own branch, to make customization easier. Now that I'm approaching a 2.0 release, I feel...

In SCM, what is a Bill of Materials?

In reading about SCM (software configuration mgt, not supply chain mgt), I have seen mention of a "Bill of Materials" as a document provided with a build. What goes into the Bill of Materials document, and what is its purpose? Is this a commonly used document? ...

Change the timestamp of a SVN revision

We had a power failure, that exhausted our UPS and subsequently shutdown our SVN machine. When it booted back up it, the system time was incorrect. Unfortunately, this was not caught until some people had already committed a changes. So now we have a few revisions that predate the first revision by several years. Is there a way to co...

Svn Repo Syncing

I would like to keep a copy of a 3rd parties code in my SVN repo. (so I can run reports and tests) How could I sync a certain folder / path from their repo into mine? Obviously I can't just do an export from their repo and commit to mine because this would miss deletes. Extra cool points for an automated solution. svn:externals could...

Msys Git Merge Tool Command Options Issue

I'm using msys Git for source control on a Windows machine and I'm trying to figure out how to get my merge tool, WinMerge, to work with Git. I've followed the instructions on this blog to the best of my ability since it's the closest I've found to what I'm trying to do. Basically what I did was: Modify my .gitconfig file to include th...

Should I keep todo lists in source control?

I have some trouble figuring out the best way to store my programming todo lists. I consider the following: one todo list in source control for each project a master todo list (with general tasks) in a personal folder in source control How do you find that? What would you suggest? Edit: Thanks for the suggestions. I use a bug tr...

Public Perforce Open Source Repositories?

While there are many open source repositories using CVS, SVN, and git, I'd like to know if there are any built atop Perforce, as I've been happily using that for CM at home for many years now. Perforce provides a public depot, but the projects hosted there appear to be strongly Perforce-oriented. What I'm working on has nothing to do wi...

Modification history in a file

I have worked a few places which haven’t used source control. They seemed to get into the habit of putting comments around code they changed explaining the change so that things could be reverted. I have found that this makes the code very difficult to read, and have been fairly adamant that such comments are not needed after introduci...

git, don't show me *.pyc in the list of untracked files!

When doing: >git status It shows a big list of .pyc files under "untracked files". I don't want it to show these, as it adds noise. In other words, how do I make git ignore .pyc files all the time and for all projects? EDIT I'm not asking for a way to spread my ignored files to other people, I really just mean "for all projects", ...