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

learn more… | top users | synonyms (2)

5
votes
2answers
53 views

How to incorporate a database into a branch-per-issue version control process?

We're hoping to move to a new branch-per-issue process with development. To prepare for this, a lot of research and experimenting has been happening in terms of version control, CI, and process of ...
2
votes
1answer
60 views

What's the correct commit message in a multi-project repository

Somewhere else there was a discussion on putting several projects in one large repository. My question is, how does a good commit message look in those type of repos? I usually prepend each commit ...
109
votes
17answers
6k views

Should I tell someone that their commit caused a regression?

When you track down and fix a regression—i.e. a bug that caused previously working code to stop working—version control makes it entirely possible to look up who committed the change that broke it. ...
-1
votes
0answers
42 views

How to manage multiple versions of a project that each differ only slightly different. [duplicate]

I need multiple versions of the same project, each with some minor changes, such as a different set of GUI elements. Most of the time, I would like all of the changes I make to one project to apply ...
66
votes
6answers
5k views

Why does git use hashes instead of revision numbers?

I always wondered why git prefers hashes over revision numbers. Revision numbers are much clearer and easier to refer to (in my opinion): There is a difference between telling someone to take a look ...
79
votes
4answers
13k views

What is the benefit of git's two-stage commit process (staging)?

I'm learning git and I've noticed that it has a two-step commit process: git add <files> git commit The first step places revisions into what's called a "staging area" or "index". What I'm ...
13
votes
3answers
3k views

How can I organize personal git repositories?

I'm in the process of setting up a GitHub account with the plan of making a pair of libraries I developed as parts of some recent iOS projects freely available for other iOS devs to use. I don't ...
11
votes
5answers
375 views

Version controlling a database's contents

I'm working on a web project that involves user-editable content, and I'd like to be able to do version-tracking of the actual content, which lives in a database. Basically, I want to implement ...
0
votes
2answers
57 views

Test and deployment environment design for small team

Question is about organizing dev environment for the web development. There is 2 things to deploy: web site and database schema We use SVN to keep track of source code We use RedGate tools to ...
0
votes
0answers
16 views

How do I remove the history from items that come from a branch operation in SourceGear Vault?

We are currently pulling down the Development version, renaming it to the release name, such as "2.0.0.0", and using "Add files/folders..." on the folder containing the Development folder, and adding ...
4
votes
1answer
85 views

What is a good frequency for merging up feature branches to a main line?

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
0answers
16 views

What is a good frequency for merging up feature branches to a main line? [duplicate]

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
3answers
63 views

Handling source code table alignment

Sometimes there is need to have tables (big or small) in source code. ItemType const SomeTable[] = { // id name min max ITEM( 3, "Foo", 70, 180), ITEM(13, "Bar", 30, 50), ...
28
votes
11answers
2k views

Is it ever OK to commit non-working code?

Is it good idea to require to commit only working code? This commit doesn't need to leave the repository in a working state as: ... we are in early design stages, the code is not yet stable. ...
3
votes
2answers
75 views

SRS document and version control

When working on relatively small projects, but a software requirement specification document is necessary, is it a standard to include said document on version control systems or is it managed ...
18
votes
3answers
3k views

Manager reading version control commits

Our manager is monitoring the Git commits on all of our projects; usually this isn't a problem, and I love the fact that version control provides a log of all work that's happening, especially for ...
1
vote
1answer
69 views

Second Mainline Branch to Abandon Source Control Misuse?

I just learned about Source Control this week and came to the realization that my team uses it plain wrong. One mainline to commit code to live. No other branches; that's it. Branching features ...
9
votes
4answers
515 views

Is reference to bug/issue in commit message considered good practice?

I'm working on a project where we have the source control set up to automatically write notes in the bug tracker. We simply write the bug issue ID in the commit message and the commit message is added ...
25
votes
11answers
3k views

Should your best programmers have to check everyone else's code into source control?

One of the differences between svn and git is the ability to control access to the repository. It's hard to compare the two because there is a difference of perspective about who should be allowed to ...
0
votes
0answers
50 views

Git for web development on server, with “dev” and “productive” folders [duplicate]

This question has been asked before, but none of the answers could help me in my case. I am developing a web application in PHP and JS. The workflow as it is today is the following: There are two ...
1
vote
3answers
143 views

How to version control a running web application? [duplicate]

I am developing a web application in PHP and JS. The software until recently was only being developed on and not being used by clients, so I could just change the script files directly. After the ...
1
vote
1answer
69 views

How to manage legacy code in branches?

I have a website application which was developed and versioned using Git. A new version of the site was developed from the base of the older site. The 'legacy' site lives in master and the new ...
23
votes
7answers
2k views

Can I use GPL libraries temporarily for prototyping and make the future code closed source?

I am working on a prototype for a software system, which (at least at the start) will be closed source. In order to save time, I'm thinking of using (that is, statically linking) a library that is ...
0
votes
1answer
36 views

Why isn't the addremove recommended by default in Mercurial?

This is perhaps a question of strategy more than anything else. I am new to version control and I guess I should count myself lucky to have relatively more mature systems like Mercurial and Git at my ...
2
votes
2answers
144 views

Should I backup gradle dependencies to git?

I always like to backup project dependencies myself in case they can't be resolved due to a down website or because certain versions aren't available for download any more. Should I trust the maven ...
3
votes
1answer
156 views

Is there some structured format for drawing source control branching diagrams?

Everyone on my team draws branch diagrams differently, including how branches exit or reintegrate to the parent, how cherry-pick merges are shown, and a host of other aesthetic choices. Is there some ...
1
vote
0answers
69 views

Separate Version Control repository as Binary Package repository?

(( The context I have is, but is I think not too important to this question: Windows only development; Visual Studio; mostly C++ with some .NET/C# )) (I think that) Binaries should go into Version ...
1
vote
2answers
130 views

Why does Jenkins warn you if you tell it to check for changes every minute?

In the past when I've set up Jenkins to look for version control changes every second by using the cron format of "* * * * *" (or something like that). When you do this, it gives you a warning and ...
6
votes
2answers
4k views

How do you structure your branches in TFS

My group at work has been trying to come up with a good process that we can use with TFS. I'm just wondering if some of you guys had some successful strategies with using TFS across multiple sites ...
5
votes
3answers
262 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
1answer
35 views

Usage of “bugfix” to refer to UI changes in branch names

If a user interface has an undesired look (elements not having padding or margins when it would be appropriate, etc.) and I implement a correction in a new (named) source control branch, would it be ...
22
votes
6answers
2k views

What does “branching is free” mean in Git?

What does "branching is free" mean in Git? I hear this a lot whenever Git is mentioned in comparison to other version control systems. I haven't had the opportunity (?) to deal with others (SVN, ...
0
votes
1answer
86 views

Repository strategy for multiple interconnected components with small differences

At my work we have multiple products.. productA, productB, ... these products reference multiple components. componentA, componentB.. there are also shared components sharedA, sharedB... etc.. which ...
1
vote
4answers
144 views

Why are FLOSS licences applied to files instead of diffs/deltas?

In the case of open source software development, where contributions build on previous work I would find it more sensible for each copyright holder to hold copyrights on the diffs/deltas he/she ...
1
vote
1answer
75 views

How to organize remote Git branches when team does single change releases?

I am a member of a project team with somewhat unusual (or at least from my perspective) release methodology and team dynamic. The way we have been doing releases is rolling out a single functional ...
5
votes
3answers
127 views

Git, semantic versioning and how it fits into (my) a typical development timeline?

I'm working on a Q&A system and about to tag my current application with "1.0.0" for it's first official version/tag. It's about to be rolled out for beta testing to a limited test audience next. ...
0
votes
2answers
79 views

How do I organizing 2 different projects with shared code

I know there have been same question asked multiple times on the programmers stackexchange. I think my question is more specific and hence decided to start a new question. My current a project which ...
5
votes
3answers
933 views

Is it safe to install TortoiseSVN on production servers?

Small shop, few production servers, no test or development servers, all Win2k3 WEB based. There is a need to keep versioned files on one of the machines. Is TortoiseSVN safe against exploitability, ...
1
vote
1answer
83 views

Using conditional feature compilation/inclusion for release versioning

I have been playing with the following idea: commonly when different release series (1.0.x, 1.1.x, development code) of a product are maintained in parallel one uses different branches within a ...
13
votes
6answers
753 views

Strategy to use version control on a modular system

Let's suppose (for simplicity) that we have an application featuring client and server; is there a better idea to use one repository for both or a pair of separate repositories? Mixing them will ...
81
votes
3answers
29k views

Choosing between Single or multiple projects in a git repository?

In a git environment, where we have modularized most projects, we're facing the one project per repository or multiple projects per repository design issue. Let's consider a modularized project: ...
8
votes
3answers
3k views

Are There Realistic/Useful Solutions for Source Control for Ladder Logic Programs

Version control for ladder logic (LL) programs for programmable logic controllers (PLCs) seems to be virtually non-existent. It may be because LL is a visual language and tends to be stored in binary ...
4
votes
1answer
88 views

In 'branch by abstraction', how would one do code review?

My manager recommended I consider the technique of 'branching by abstraction', in which, rather than creating feature branches, multiple developers work in the same version control branch, and ...
13
votes
5answers
5k views

Is it reasonable to use git only on my local machine?

Is it ok to just use git only locally? I don't want to have to pay for a service that provides private repositories (such as Github) but I think git is a great way to organize my closed-source ...
2
votes
1answer
328 views

Appropriate Git workflow for multiple active releases while handling hotfixes

I'm trying to choose a Git workflow that is most appropriate for our product. Here are the parameters: We do a few major releases a year, let's say 10 at the most We have multiple versions of our ...
1
vote
0answers
62 views

Setting up Version Control on my Development Server

I'm looking into the possibilities of integrating Version Control so that me and my team can work on code at the same time without having to worry about overwriting each others work. Previously this ...
6
votes
2answers
217 views

Version control for code that contains student exercises

I have a fairly substantial Python project that I have developed as an educational endeavor. The version of the code that shall be given to students has exercises throughout, in the form of code that ...
3
votes
2answers
167 views

How can I develop a productive Git(hub) branch workflow for an open source project?

I am writing a simple framework that I want to open source just for experience (and fun!). However, it has some cool ideas that could make it grow to a larger project and I want to be ready if that ...
5
votes
1answer
875 views

Is there an established or defined best practice for source control branching between development and production builds?

I struggled in how to phrase my question, so let me give an example in hopes of making more clear what I am after: I currently work on a dev team responsible for maintaining and adding features to a ...
8
votes
3answers
2k views

Git workflow for small teams

I'm working on a git workflow to implement in a small team. The core ideas in the workflow: There is a shared project master that all team members can write to All development is done exclusively on ...