A programming discipline for tracking, storing and retrieving revisions of source code.

learn more… | top users | synonyms (2)

-1
votes
0answers
32 views

NuGet Package Restore vs Keeping Everything in a VCS

We're having a big argument here over whether to keep all project dependencies in a VCS (Mercurial, in our particular case) or rely on NuGet restoring them. I'm a strong believer in that everything ...
12
votes
9answers
3k views

From TFS to Git

I'm a .NET developer and I've used TFS (team foundation server) as my source control software many times. Good features of TFS are: Good integration with Visual Studio (so I do almost everything ...
88
votes
12answers
6k views

Should the commit history be used to convey critical information to developers?

During a meeting regarding the rollback of a third-party SDK from the latest version it was noted that the our developers already flagged in the commit history that the latest version should not be ...
0
votes
1answer
97 views

Developer Branch vs. Feature Branch [duplicate]

I saw around that development teams usually use source control in one of 2 schemes: Either "Feature Branch", where each feature is developed in a new branch, or "Developer Branch", where each ...
22
votes
2answers
931 views

How to enforce good/better source code control practices?

I suspect that I'm focusing on the wrong problem so I will first describe what I think the problem is before presenting the possibly suboptimal solution I envision. Current Situation: Currently my ...
2
votes
3answers
299 views

How Best Can I Use Git When My Employer Uses VSS?

I am going to be working with VSS but I am much more productive and diligent with GIT. I have to fit within the workflow of VSS and keep good history in VSS. The standard work flow here with VSS is ...
4
votes
3answers
176 views

What's the purpose of keeping a changelog if everyone uses their VCS properly?

Every VCS that I've seen includes a means (and sometimes requires you) to make a log of what a particular commit does. If this history is being properly kept, what is the purpose of manually keeping ...
0
votes
2answers
52 views

VCS - Better way to change location than pushing to branch?

I work from multiple locations quite frequently, and there's times (16:59 on a Friday for example) when I need to leave quickly with potentially unstable code. Right now I tend to commit and push the ...
26
votes
2answers
16k views

Git branching and tagging best practices

I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag? For example, say I ...
6
votes
3answers
1k views

Distributed Issue Tracking [closed]

Distributed issue tracking seems like a belting idea to me, but it has never really taken off in a big way. Is there a good reason for that? I am aware of: bugz everywhere too complex to set up ...
1
vote
1answer
43 views

Can tags be used as bookmarks under semantic versioning?

Shameless plug: this question is for StackMode – a StackExchange client for GNU Emacs 24+. The product I'm working on, version-controlled with git, is a desktop application with an innately exposed ...
4
votes
1answer
106 views

When deploying code to a production server, how are non-source code assets such as images and PDFs managed?

Currently, I am trying to set up deployment procedures and GIT for a group of websites. Code and assets are between 15 and 20GB. The code and related text files are probably closer to 150MB. When ...
0
votes
1answer
95 views

Which version management design methodology to be used in a Dependent System nodes?

This is my first question so please indicate if my question is too vague and not understandable. My question is more related to High Level Design. We have a system (specifically an ATCA Chassis) ...
14
votes
6answers
4k views

Git-friendly spreadsheet format? [closed]

We're trying to move our project documentation process from Google Documents to a set of self-hosted Git repositories. Text documents are Git-friendly enough, since we usually do not need any fancy ...
1
vote
1answer
29 views

QA and Feature Branches in Web Development

I am trying to introduce to my team a more sophisticated branching model than "commit to master and push". We are a small team of two analysts, three developers and one tester. At the moment, a ...
2
votes
1answer
68 views

Managing Database version controlled migrations using a list/table

I'm not much of an expert in the area but I am aware that solutions already exist to managing database migrations in version control, e.g. sqitch and liquibase. However I'm currently planning a small ...
3
votes
2answers
107 views

How best to version control massive configuration for an application?

Apologies if this doesn't make sense, English is not my first language. I'm working on an application where workflow is split into 'rules' that are defined on several pages of an Excel spreadsheet, a ...
5
votes
3answers
421 views

How to properly deprecate methods in Java?

Today I lost a method that I was using since my co-worker redefined it to take its superclass instead. So after synchronizing with the repository I had trouble. Would it had been better in this case ...
1
vote
2answers
193 views

Is revision control fundamentally at odds with live coding?

Both live coding, and revision control, are very valuable tools when programming. But they seem to have inherently conflicting characteristics. Is it possible to fully benefit from both at the same ...
5
votes
1answer
382 views

Having many versions of an application [duplicate]

Basically the scenario is this: There is one main version of an application but it is modified for each client. The development is usually through the version that is currently worked on All the ...
24
votes
7answers
2k views

Is it a good practice to run unit tests in version control hooks?

From the technical point of view it is possible to add some pre/post push hooks which will run unit tests before allowing some specific commit to be merged to remote default branch. My question is - ...
4
votes
1answer
127 views

Is licensing an issue for Git Submodules?

For example: an MIT-licensed project wishes to simplify the build process for its users by including part of the GNU toolchain (which is of course GPL) as a Submodule. Could that be interpreted as ...
8
votes
1answer
2k views

Why do Git/Mercurial repositories use less space?

I've read on several discussions here and on SO that DVCS repositories use about the same or less space than their centralised counter-parts. I may have missed it, but I haven't found a good ...
18
votes
5answers
2k views

How would one handle external dependencies in an open-source project?

When one writes an open-source project and uses Google Code or GitHub, and wants to use a library like Lua, how should one do this? Should the dependency be included in the repository? Should the ...
0
votes
1answer
75 views

Choosing the right Release management & Branching strategy

I am working on a project wherein we are to use SVN as a source repository and we need to identify a branching strategy. I am aware of branch by release & branch by feature strategies to certain ...
2
votes
1answer
79 views

Managing shared code in source control

Projects A and B both use library project L: Judging by what people have written about it on the web, managing this situation appears to be a headache: ...
0
votes
5answers
92 views

Should private key files be checked-in in git?

In my understanding, git as version control system should track all resources or files that are necessary to build a software version. If a private key file is needed for a server to function ...
30
votes
4answers
2k views

Should test data be checked into version control?

I'm writing some test code for a feature which processes PDF files. The basic idea behind the tests is that I point them towards some PDFs I've selected specially, they process them and I check that ...
4
votes
5answers
2k views

Managing a website with version control?

The small website I built a long time ago is starting to pick up a little and I'm starting to run into problems with making changes. Originally, all the pages were .html and I would edit and test them ...
0
votes
1answer
73 views

snapshot in git or version control system (vcs) [closed]

I recently started learning/working git. I've gone through some materials but still didn't understand what actually is a snapshot.
0
votes
0answers
26 views

Should I keep JBoss under version control? [duplicate]

Should I keep my JBoss installation under version control so other team members can pull it? Is that common? Configuration changes, module installations etc would be version controlled. I have a ...
0
votes
0answers
17 views

version control (mercurial) access by subproject

I have a central codebase, from which I branch subprojects for each client. Right now I have the central codebase in mercurial repo A and client specific code in mercurial repo B, C, D... etc. I would ...
19
votes
4answers
2k views

What is the best way to handle product versioning and branching of long term projects?

In a general sense, for long term projects that may have multiple releases during the products life cycle and require support of previous products, what is the best way to handle product versions and ...
1
vote
2answers
153 views

Using SVN with multiple developers but without creating branches

I'm a computer science TA working with some students in a senior capstone course (effectively, a consultant for a small team). I met with them to discuss how to use version control, and they're in an ...
1
vote
1answer
101 views

Having unwanted bits in version control history

Consider having a project which you would want to release as open-source. There are parts which you have removed, but still remain in version control history. License of those parts is not ...
2
votes
1answer
113 views

Where do I put the changelog to display the recent changes to the user?

I want to create a changelog for my application to display the set of recent changes to the user. But I'm not sure where I put it. Do I create a text file and write in it? Where do I put this text ...
87
votes
10answers
6k views

What should I do when I've already waited too long between commits?

I was naughty... Too much "cowboy coding," not enough committing. Now, here I am with an enormous commit. Yes, I should have been committing all along, but it's too late now. What is better? Do one ...
2
votes
2answers
61 views

how to manage a release of both sw and config data

in my repository I've got a sw and a cfg(config) folder under trunk, I'm thinking that when I release I'll branch both of these to the releases folder e.g. v1 of my app, with London config data. If I ...
4
votes
3answers
108 views

Version control workflow for semi-bespoke software

I have a web app product (PHP, MySQL) for which I offer a bespoking service. That is, you can buy the main product, which is quite extensive, and then have it customised however you like. This might ...
0
votes
2answers
82 views

Dealing with code that has been written but isn't yet needed

I wrote a class to do something, but then realised that it wasn't needed, as I could optimize existing code to get the speed of execution I needed, rather than integrating the new class in with ...
0
votes
1answer
167 views

Version controlling of a web project

We (2 developers) are developing a cakephp app that is running on a remote server. In NetBeans we both have project set up as "PHP application from remote server". The problem is that whenever one of ...
8
votes
4answers
729 views

How to use github, branches and automatic releases for version management? [closed]

I understand most of the basic Git/Github concepts by now, however I still have trouble understanding the bigger picture. These are some things that I have managed to get working so far: Push ...
-3
votes
1answer
88 views

Version Control Options for Shared Network Folder [closed]

The company I work for has no version control. It will never have version control, so a server-based solution is out of the question. Also, our network is extremely slow. Often, it takes a few ...
0
votes
0answers
35 views

Changelog in Comments Versus Source Control Log [duplicate]

Until recently, I have worked on a code base which kept change logs both as a table in the header section of each file and as comments in source control. In practice, only the header comments were ...
3
votes
4answers
2k views

SVN: Working with branches using the same working copy

We've just moved to SVN from CVS. We have a small team and everyone checks in code on the trunk and we have never ever used branches for development. We each have directories on a remote dev server ...
2
votes
2answers
63 views

git workflow for separating commits

Best practices with git (or any VCS for that matter) is supposed to be to have each commit do the smallest change possible. But, that doesn't match how I work at all. For example I recently I needed ...
1
vote
1answer
160 views

Develop in trunk and then branch off, or in release branch and then merge back? [duplicate]

Say that we've decided on following a "release-based" branching strategy, so we'll have a branch for each release, and we can add maintenance updates as sub-branches from those. Does it matter ...
3
votes
2answers
216 views

How do programmers handle several versions of a same program? [closed]

A lot of apps, for instance, have a free version and pro version. Do programmers, when a new update is released, remove lines of code that shouldn't be available in the free version? As for Visual ...
0
votes
1answer
74 views

Dealing with data, when your database is under version control

Currently my database is not under some kind of vcs, we can get deltas but that's about it. I would like to try and make product deployments more automated, and less time consuming. I understand that ...
0
votes
3answers
162 views

How come centralized source control solutions don't do branching in place

With centralized source control like Perforce and SVN, when they create a branch, they create a whole new directory. However, git and other distributed source control solutions, in my experience, are ...