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

learn more… | top users | synonyms (2)

2
votes
1answer
98 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
206 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
134 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) ...
19
votes
6answers
7k 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
123 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 ...
3
votes
1answer
120 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
123 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
736 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
242 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
405 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 ...
4
votes
1answer
220 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 ...
10
votes
1answer
3k 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 ...
19
votes
5answers
3k 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
327 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
147 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
182 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 ...
31
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
4k 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 ...
1
vote
0answers
27 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
3k 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
426 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
109 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
145 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 ...
5
votes
3answers
144 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
90 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
190 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 ...
14
votes
4answers
7k 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 ...
-2
votes
1answer
390 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
36 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 ...
4
votes
4answers
3k 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
79 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
733 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
222 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 ...
1
vote
1answer
114 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
214 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 ...
-1
votes
1answer
140 views

How to organize repository branches? [closed]

I am trying to find a way to organize the branches in my repository in a sensible way. I would like the main branch to contain only "clean" commits: features that are (mostly) complete, no superfluous ...
0
votes
3answers
257 views

Is it a newbie mistake to avoid branching? [duplicate]

My team is new to versioning and we're trying to keep things simple, as to not overwhelm ourselves with tools-headaches. Also, our product can't be compiled and run locally, so our work is actually ...
11
votes
2answers
272 views

Is the inconvenience about merging in SVN prior to v1.5 obsolete by now when lack of metadata isn't the case anymore?

I'm getting started with SVN and so many sources say that merging is very difficult in SVN as compared to DVCS tools. The most recent questions I could find here on SE are from 2012. Sometimes ...
0
votes
4answers
335 views

Proper sequence of actions for merging using SVN?

I'm totally new to CVCS (SVN specifically). I find that most resources focus very strongly on the command-line commands (irrelevant; we use Windows Explorer + TortoiseSVN) and about structure (e.g. ...
-2
votes
2answers
183 views

What to do with a long unfinished project? [closed]

I am a programmer hobbyist (self learnt), and once in a while I like to make games and interactive scripts (nowadays mostly in JavaScript for its ease). Sometimes I start long projects that end up ...
21
votes
6answers
2k views

Quantifying the advantages of a modern version control system [closed]

I've worked as a team lead/developer in a large financial enterprise environment for the better part of three years. Our production release process is a nightmare because it revolves around Clearcase. ...
2
votes
3answers
554 views

Easy way to serve mercurial? [closed]

I am currently using TortoiseHg on windows. I want my server to be available automatically as it is switched on. But I need to do these: when I set up a new project, I need to enter the ...
5
votes
1answer
408 views

Overlapping Version Control Repositories

So, I'm working with an open source project, and I'm making some significant changes to a small module of the project. The project uses SVN as its version control, and I need access to this ...
7
votes
2answers
1k views

How to convert a Bazaar repository to GIT repository?

We have a large bazaar repository and we want to convert it to a git repository. The bazaar repository contains the folders of each of the interns. Any documentation/code prepared by interns is ...
1
vote
2answers
106 views

How does one store a website's holding/maintenance page in Git?

I'm trying to tidy up the Git repositories for the few sites that I maintain. For each site, I usually create a separate branch in the repo that holds a "maintenance page" or "holding page", which I ...
16
votes
5answers
2k views

What advantages do continuous integration tools offer on a solo project?

If you're doing a solo project - would you use CI tools to build from a repository? I've used Hudson and Cruise Control in a team environment, where it's essential to build as soon as anyone checks ...
27
votes
10answers
2k views

Should temporary code be put under version control and how?

Here are some examples of temporary/local code. It is needed in order to work with the codebase, but would be harmful to be part of it: Project files. Paths may need to be edited in order to reflect ...
2
votes
2answers
142 views

How to handle duplicate files in version control

Right now we use a very simple system for version control. We have a completely flat master repository for our entire product line. As our codebase grows and we add more products to the product ...
-1
votes
4answers
245 views

What are some version control systems based on different concepts than Git, Mercurial etc? [closed]

Most of the version control systems I have used have a lot of similar functionallity for source code files: they work on their text content, diff using well known diff algorithms, the changes contain ...
27
votes
7answers
1k views

Using some kind of version control when working alone and with small projects?

Very often I'm working on small projects only for myself. I'm working on one machine, but recently I thought about using some kind of version control nevertheless. This would have some benefits as for ...