I am the only developer in my company, and as such I control everything from deployment to bugfix to new features. My tool of choice is VS2010 and I code primarily in ASP.NET for new features and Classic ASP (sigh) for the bugfixes. I only have VS2010 Pro and I do not have access to any of the MS Team software. Now we are setting up a n...
I have a working folder that's synced to a team server. I was wondering if there is a way to remove some of the subfolders (i.e., stop syncing them, and make them invisible to others), without actually deleting them on the local drive? ...
I was developing team project and suddenly realised that i've made so many changes, that i need create branch. I've never used branching in TFS and when i saw "Branch\ "From Workspace version" i thought that's, what i need. But this option doesn't act as i supposed. How can i create new branch, from my "LOCAL COPY of Project" and incl...
Hi all. I work for a small web development company (6 people) and we've been in the market for a new code editor/development environment for quite some time. Currently, we're using Dreamweaver's (CS3) coding side for our site development. Each site's files is hosted on a Dreamhost ftp server. All 6 of us work on the same set of liv...
Hello, We have a file that we need to be tracked in our Git repository. Most users need to be using this file as normal: committing changes to it, pushing, pulling, etc… We have one user for whom this file causes various computer issues, and never uses this file regardless. We want this user's repo to "skip" dealing with this file alto...
Hello, I have to install a code versioning system for a project. I would like to have two branches, one public and one private; each branch has it's own set of users. I would like to write some hooks for the private branch - when a developer commits code in the branch, some files are copied into another localation (similar to a deployme...
In most teams there is a rule that says that the @author and @since keywords have to be used for all documented classes, sometimes even methods. In an attempt to focus on what matters, I don't use these keywords and instead rely on the fact that I can use the source control management system to determine who the author of a class is and...
I'm maintaining a project that was not initially using a version control system. Instead, there would be periodic snapshots of the code base saved into a backup folder, and there would occasionally be a makeshift branch created. When I got a hold of the project, I created a Subversion repository for it, committed each snapshot to the rep...
We'd like to switch up from SVN to Git or Mercurial at work, and Mercurial we would like to investigate first. I have installed Hg on my Windows machine and got the Eclipse plugin, but I don't get a perspective like I do for SVN inside of Eclipse PDT. Does this not exist, or do I have the wrong flavor of Eclipse? I would like to see m...
Hello internet techno-persons, I am writing a project for users to create documents from document elements (basically images and html fragments). The top level documents will be under basic version control (where every save increments the version number, and all previous versions are kept in the db) The document elements will also nee...
With Mercurial I do: $ hg in With SVN I do: $ svn log -r BASE:HEAD How do this with Bazaar? ...
This post might be a bit long, but if you think you can help, please read it because it would in literal terms be a lifesaver. Here's the scenario. I am working on a project [for KDE], whose trunk is hosted at, lets say: http://ubersvn.org/home/uber/trunk/myapp. Also, I'm working on a branch, lets say: http://ubersvn.org/home/uber/branc...
We are using TFS for our code: trunk + branches for coding activities. There are 6 devs in my team. Problem: sometimes developers don't want to create a new branch (or use an old one) to fix/develop something. They just do it in trunk. OK, in some cases it's acceptable. But most of the time it creates a lot of troubles. How can I enfo...
Suppose I have built a lot of dlls from a certain revision of the svn repository. (It might by any revisioning system) I am able to create a resource file containing an entry that denotes the revision number. Can I link that resource file into the dll's I have already built? Some sort of editbin or the like? ...
Is there a way to copy a file (or subdirectory) within a git repo and have git merge upstream changes to both copies? Randal Schwartz mentions that git can do this (27 minutes into this Google Tech talk: http://www.youtube.com/watch?v=8dhZ9BXQgc4 ) Background: I'm using git to track and update CMS software---i.e., I have the CMS in a ...
There are formats that are actually zip files in disguise, e.g. docx or odt. If I store them directly in version control, they are handled as binary files. My ideal solution would be have a hook that creates a foo.docx/ directory for each foo.docx files before commit, unzipping all files into it optionally, have a hook that reindents...
My project has a CC licensed music book. I want to get it in Adobe InDesign to apply a nice layout but Im afraid it will make community based corrections impossible. Anyone know of a good solution to take a wiki-like editing system that can easily apply a design and be turned into a pdf? Thanks ...
Hello: I'm working on deploying a Python module composed of several dozen files and folders; I use Mercurial for managing the software changes. I want to keep the same module in three branches: the official one (which the team uses), the development one (this may be more than one development branch), and the testing branch (not the tes...
I'm looking for pointers, suggestions, and even dictation on how to manage the three different assembly version numbers for a .NET assembly. The Product version is the simplest, as this seems would normally be dictated by business. Then, the file version seems to be for versioning between deployments, where the actual assembly version...
I would like to checkout a single file from a remote git-repository. Is there a way to checkout a single file from a remote git-repository, without checking out the other commits? EDIT: Following the answers, I've realized that i can do a git fetch, and then a git checkout origin/branch path/to/file, which works great. ...