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

learn more… | top users | synonyms (2)

11
votes
5answers
217 views

Splitting coding progress into meaningful commits without too much overhead

When working on a fix or a feature, I sometimes stumble over other tiny issues that can be improved on the fly in a matter of seconds. When I do them immediatly and then commit the finished ...
3
votes
1answer
122 views

How to improve our source control process

Background: We are using agile project management and follow sprints to do development. We are using a single repository in bitbucket.org that uses mercurial. Repository is hosting 3-4 products. ...
-2
votes
0answers
39 views

Branching for websites coming from base code [closed]

I'm trying to develop a version control strategy for websites coming off of the same base code. I've been developing a plan and would like to request feedback as to the feasibility of it. For ...
-2
votes
3answers
144 views

What is the most elemental workflow for TDD?

Gradle is such an interesting build tool that it prompted me to look at Spock and JUnit -- which I've never done before. What is the basic workflow with TDD? My approach has been to do frequent ...
1
vote
1answer
32 views

Managing Opengl projects under Team Foundation Server

I am learning OpenGL/C++ by following a tutorial series on in2gpu. I set up my Project just like the autor did. It is an Empty Visual C++ Project. Inside the project I linked glew and freeglut, the ...
0
votes
0answers
43 views

How do I share SVN trunk with multiple branches? [duplicate]

I have a project that I have been working on for a couple years. The project has gone fine. The sales team has struck a deal with a separate client that wants to have its own changes to the existing ...
6
votes
3answers
95 views

Project Cleanup and Version Control Best Practices

Question Background: I have a rather large project that I started before I learned about a beautiful thing called version control. Now, I have a ton of files labeled with the convention ...
5
votes
4answers
183 views

Is there any downside to commit messages containing the ticket number

I was wondering if it would be good practice for commit messages to contain the ticket number they were apart of. It would be like 2568 Fix heating issue Summary of the issue with a bunch ...
3
votes
0answers
39 views

How can I organize my TFS structure such that a one-off project that pulls files from another project can be easily managed?

I have my main project set up very simply in TFS. I've recently begun making a few of my project components generic enough that I can sell them to other organizations using the software for which I ...
0
votes
0answers
26 views

Using ClearCase file revision system for a multiple teams for a single file

We use ClearCase for file revision system. If a particular common file is considered, there are about 1000 revisions through branches and sub branches, the main branch is getting updated, but nobody ...
7
votes
3answers
151 views

Git branching strategy for long-running unreleased code

At our team, in addition to individual units of work (Stories), we have longer-running themes of work (Epics). Multiple stories make an epic. Traditionally we've had feature branches for each Story, ...
5
votes
1answer
72 views

Optimizing a file type for compare tools

Context: I am developing a visual studio plugin that generates layer diagrams. I want the tool to be able to produce an intermediate output, which is the data representation of what is being rendered ...
0
votes
2answers
52 views

Should I use a single repo when multiple parts of the same project are running on the same server? [duplicate]

I'm planning a project that consists of the following parts: REST API in Lumen Web client in Laravel Product website in Jekyll These separate products are going to be running on the same server. ...
3
votes
1answer
99 views

Do I update the copyright header when i modify the source?

Suppose I were to modify a said piece of code and put it back on github, would I have to update the license header. This is the code(Licensed under the Apache License, Version 2.0): ...
5
votes
4answers
190 views

How to determine when to open a new branch or a new repository when using Git?

Currently I am working on a project to make a product for company X. The team I am working with is selling similar service to many company with similar product, where 40% of the code is reused and 60% ...
5
votes
3answers
100 views

Do we need to create local branches for the enhancements we are working on?

We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
1
vote
3answers
105 views

Steps to begin versioning a web application

Until now, we have not had an application version strategy or version-ed our application. We are considering doing so with our next release. What are the minimum tasks necessary to transition to a ...
12
votes
2answers
254 views

Workflow, editing things not in your current task

Usually when I program, I have a clear task ahead of me, but find annoying things I'd like to clean up as I go on. Here I see three options: Do it later (may forgot/have to spend time adding a ...
1
vote
2answers
452 views

Making major version step in software development in separate repository [duplicate]

Currently we are planning to switch from our software version 5.x.x to 6.x.x. Such major releases contains in our case a lot of refactoring work and changing the software architecture. Instead of ...
2
votes
1answer
40 views

How to integrate modified generated code into the build process?

I'm using a code generator which has the following workflow: Configure stuff Generate code Modify generated code with user code at specifically annotated positions. If changes are required to the ...
12
votes
2answers
283 views

Continuous Deployment with gitignore

When doing continuous deployment with Git, how do you handle ignored files in gitignore? Those files are ignored for privacy reasons (i.e. don't want them pushed out to other remote repositories, ...
22
votes
6answers
799 views

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
115
votes
9answers
10k views

Maintain hundreds of customized branches over master branch

Currently we have one master branch for our PHP application in a shared repository. We have more than 500 clients who are subscribers of our software, most of whom have some customization for ...
12
votes
3answers
411 views

How can we keep track of which version of our code is in each environment?

My team currently uses a fairly simple branching/deployment process that looks like this: ┌────────┐ ┌────┐ ┌──────┐ Environments: │ DEV │ │ QA │ │ PROD │ ...
1
vote
2answers
49 views

Can version control systems use the filesystem log to capture changes?

I was trying to find a "perfect" syncing program between a network share and a local folder, when I realised that it's probably impossible to do it right unless all the filesystem operations were ...
0
votes
0answers
29 views

Is there value is putting test/build outputs under source control?

My colleagues insist on ploughing every bit of output data they can into subversion. I can't see the value in this practice and would much rather use a file system. The key offenders are build and ...
2
votes
2answers
137 views

Should we include Nuget PACKAGE folder in version control?

I would like to know In C# or VB.NET project should we include the PACKAGE folder (nugget package folder that is created to the root of my project that contain the nupkg files and other content) to ...
2
votes
2answers
65 views

Mercurial Branching from a branch

We are in a situation where the customer has requested an urgent deployment of the current features we are working on. These features are being developed in a mercurial branch named 'sprint 1' for ...
10
votes
6answers
431 views

How can we only include ready-to-be-released features in our production releases every other week?

I'm a software developer on a fairly large agile team (we have eight developers actively making changes to a single code repository). Every two weeks, we push a new version of our software to ...
2
votes
0answers
76 views

Justification for different code bases on different branches in the same repo? [closed]

Branches in git repos or similar are practically always derived from the same code base; after all, they're usually merged back in to master later. But, if you wanted your open source project on ...
1
vote
2answers
39 views

Workflow for chains of dependent pull requests to projects that depend on other projects

Suppose you have project A and project B, where project B depends on project A - let's say A is a library. And project A and project B live in separate version control repositories - either because ...
0
votes
1answer
54 views

Should source control file directory match solution/project namespaces?

My team is trying to decide how to best organize/structure our TFS directory. One proposed solution is to create a directory structure that will dictate the namespaces for our c# projects. For ...
5
votes
3answers
302 views

Does Continuous Integration imply one monolithic VCS repo?

I am part of a small team which develops several internal apps for our company. We are in a process of becoming more Agile, this especially includes lots of automated testing. Now we are in a ...
10
votes
2answers
293 views

Why do DVCSes seem to all have an irrational phobia of uncommitted changes?

Coming from a SVN background, one of the hardest things to get used to when working with DVCS systems is the way they all seem to regard any uncommitted change whatsoever like a ticking time bomb. In ...
6
votes
1answer
280 views

Version control of a website : dev/production front-end files

I'm trying to think of a better way to version control our website projects. Keep in mind I'm only a front-end dev so I don't have a profound knowledge of VCS. Workflows are changing, and past ...
1
vote
1answer
77 views

Maintaining multiple versions of a library that all need maintenance and development

I'm writing an interface to a lexicon in Java. I just started this project, and the lexicon is on version 3.8. When a new version comes out, say version 4.0, database columns may be renamed, removed, ...
1
vote
3answers
142 views

Git repo with lots of medium-sized images?

I've just used git-tfs to checkout a TFS repo into a Git repo. The .git directory comes to 2.33GiB, and the primary reason for this is a couple of large directories coming to about 650MiB each. Each ...
2
votes
2answers
310 views

How do you sync changes to the data in your database? [closed]

I am new to a team developing a very large web application. Prior to my start, the team had 0 automation in place and just did everything by hand. This was possible because they were only a team of 2. ...
15
votes
2answers
758 views

Is it good practice to store software version numbers in VCS?

A product version, such as v1.0.0.100, represents not only a unique production release of software, but helps identify feature sets and hotfix stages for said product. Right now I see two ways to ...
0
votes
1answer
39 views

Ways of embedding static data with python application

I have several projects on Python I am currently versioning with Git. I also have the input-output data that is gradually changing over the course of the project. I need to be able to re-run my ...
0
votes
1answer
85 views

How do I bundle library files for use in branches?

I work at a company which has it's source code managed using subversion. Our code base is huge (800MB) but we want to work with branching. For what I noticed is that when branching, SVN just ...
2
votes
2answers
188 views

How to encourage contributors to choose rebasing over merging?

Here's a chunk of commit messages from our repo. It's mercurial but I believe in this context git will be relevant as well: Viktor Bubnidze TEST: chat send url fix changeset Kate Gunicky ...
4
votes
2answers
247 views

Delete unused source code from the repository or keep an archive folder?

At our company, we have a single version control repos with a structure like this: /client1_product /client2_product /... /shared_lib1 /shared_lib2 /... After almost two decades of development, ...
5
votes
3answers
202 views

How do we control which features get released?

I'm working in an environment where we regularly start working on a feature and then are directed not to release it. We then create other features that we do want to release. My typical workflow is ...
27
votes
3answers
2k views

Version control practice for Rewrites

We developed a product (prototype) P_OLD in language X and we are now rewriting it from scratch as P_NEW in language Y. Since P_NEW and P_OLD are the same product: Should P_NEW just be a brach of ...
2
votes
1answer
76 views

Good idea to include test logs in software repository?

I have written a software in python with unit tests and system tests together with an other developer. The software is version controlled with git. Before we merge branches, we ensure that the ...
0
votes
2answers
164 views

How to change the same code stored in several places after I improve one of them?

I have some code written in Matlab. I use the code in different folders which contains different data. Because I want to change some parameters for each different data, I keep the code in the folder ...
2
votes
2answers
278 views

Source control branch design for deployed environments

I currently work with a young team of developers using ASP.NET, TeamCity and Octopus Deploy. One of our developers thinks that our system is flawed and introduces the inability to test production ...
1
vote
0answers
61 views

What git process when it says “removing duplicate objects” on merging branches?

Git displayed "removing duplicate objects" after I merged a branch to another and noticed my .git/objects folder has significantly reduced (from 40.7 MB to 33.5 MB). Isn't branch just supposed to be ...
2
votes
2answers
79 views

How to handle pull requests to original repo with changes dependent on a newer version of the compiler

I have a github project that I've forked. The original repo was written for a version of OCaml before version 4.02.1. The 4.02.1 compiler gives me various deprecation warnings which I plan on fixing ...