Questions tagged [version-control]
A programming discipline for tracking, storing and retrieving revisions of source code.
969
questions
33
votes
8
answers
26k
views
How safe & trustworthy are hosting sites such as sourceforge, github or bitbucket for closed-source projects? [closed]
I am considering using sourceforge, bitbucket or github for managing source control for my business. I have open projects and I participate in open projects such as gcc. But I also have a business ...
- 551
8
votes
3
answers
2k
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
too ...
- 329
51
votes
5
answers
13k
views
Do I check generated code in to source control or not? [duplicate]
I'm developing a .Net application that uses google protocol buffers. Historically the application used the approach, advocated by the protobuf-net team, of decorating the classes with attributes ...
- 3,948
6
votes
3
answers
221
views
Should a new class refactored out of an existing one have history pointing back to it's progenitor
If I split one class into two classes should both classes have history in source control tracing back to the original class that contained both; or should the new class be added as a new file without ...
6
votes
2
answers
855
views
How to deal with undesired commits that break long-running release builds?
We ran into an unfortunate situation at work recently and I've been wondering what we can do to avoid similar problems in the future.
We make embedded systems. The FPGA code is in one SVN repository ...
- 199
4
votes
2
answers
690
views
Kiln - Mercurial and Git limitation [closed]
According to this blog post: Kiln now supports repositories accessible from both Git and Mercurial
We decided that the awesome way would be to make Kiln fully bilingual.
It stores every repo in ...
- 7,662
5
votes
2
answers
2k
views
Source control system for binary files [closed]
At work we have a legacy system written in Visual FoxPRO.
Everything in foxpro is a table, even forms, so basically if you open a form file with a text editor you don't learn much.
Does anyone know ...
- 207
4
votes
2
answers
262
views
Is it a good idea to create multiple heads with Mercurial? [closed]
I just made a commit that I want to reverse, but I want to keep the bad commit in history. So, I hg update to the previous (good) commit. Then I keep working.
This leaves me with a new head: the ...
- 431
3
votes
1
answer
215
views
Contributor's actions after rejected pull request
Imagine, there is an open-source project with a Maintainer and a Contributor. Both of them have theirs repos exported to some repository hosting (github, bitbucket, sourceforge --- whatever, but they ...
- 133
5
votes
1
answer
870
views
Is git-flow in the spirit of git? [closed]
The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
- 837
11
votes
5
answers
4k
views
Is it a good practice to have a remote branch for each developer?
Is it considered a good practice to have a remote branch for each individual developer in the project?
We're using Git with the following branches:
master
release
develop
If each developer had ...
- 221
2
votes
2
answers
241
views
Feasibility of continuous delivery with a mixture of development platforms
What are the major obstacles (and potential solutions, if known) for implementing "continuous delivery" software development when an application relies on varied programming languages or modules... ...
- 123
4
votes
1
answer
484
views
Is it wise to include something like OpenSSL or GnuTLS with a project in a repository?
I am currently working on a project that makes use of the OpenSSL library for secure communications. Since this library is a requirement for building the project, I am considering including it in the ...
- 700
3
votes
3
answers
2k
views
Can my GitHub and SourceForge account share the same repository?
I like that SourceForge can also let people browse your code using Git. But, before I even set up the project on SourceForge, I had a GitHub repository for it. Now that I have created my SourceForge ...
- 149
7
votes
6
answers
772
views
Version control: Dealing with incomplete/broken code
It seems to be a generally accepted good practice not to push invalid, broken, or incomplete code. But one of the huge advantages of version control systems is that it gives you a remote place for ...
- 2,105
21
votes
3
answers
7k
views
When was source control invented?
I'm aware of many version control systems: CVS, SVN, TFS etc...
I've googled for the very first "revision control/version control system" and seen various conflicting answers.
When was source ...
- 11.1k
6
votes
4
answers
1k
views
Git: rebasing on top of a refactor that affects the target rebase branch
Let's say I have a feature (topic) branch that I keep rebased on top of my development branch. During the course of the project (before merging in my feature branch), I decide that I need to make a ...
- 161
7
votes
4
answers
2k
views
Is Using Locking/Unlocking in Version Control an Anti-Pattern?
Recently I've started using Git at work. Previously I've only ever used VSS (which has some problems) and so far, Git is orders of magnitude better.
The key differences here is that Git is ...
- 3,708
1
vote
1
answer
2k
views
How to maintain lots of different variations for deployment, using Git for development
Although there are many similar questions here regarding using GIT for maintaining different versions, none seem to answer my specific case.
I'm OK with how to use GIT to do my development, using ...
- 23
4
votes
2
answers
860
views
How to manage releases with multiple features at different states?
We have a branching structure of:
multiple dev branches for each major new feature
Main branch, merged into from a dev branch once a feature is ready for testing
Release branch, merged into from Main ...
- 681
9
votes
3
answers
2k
views
How should non-functional changes be committed?
I'm working a small-to-medium legacy codebase and when working on a ticket I will come across code that should be cleaned-up or that I need to clean-up just to be able to understand the follow of the ...
- 1,868
23
votes
3
answers
981
views
Why does git allow you to "change history"? [duplicate]
Possible Duplicate:
When should the VCS history of a project be deleted?
I am experienced using svn and recently started learning git. I was quite shocked to learn that git has features that ...
- 7,091
12
votes
7
answers
3k
views
Can branching ever be considered a bad practice? [duplicate]
Possible Duplicate:
To branch or not to branch?
A co-worker is against branching. I use branching all the time. I put the team onto a basic 3 branch system. I create my own feature branches. ...
- 11.1k
7
votes
3
answers
1k
views
Functional testing before code checkin
I am working on a project with legacy code where it does not have much code coverage. One of the idea to improve that is to enforce a rule that each code check-in must have test, not only test but ...
- 231
29
votes
11
answers
4k
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 ...
- 14.9k
28
votes
4
answers
2k
views
When should the VCS history of a project be deleted? [duplicate]
I just refactored my project's entire codebase. So much so that even though it uses most of the same code base, things work in a radically different way. If the old version was 1.0, the new one would ...
- 385
7
votes
3
answers
242
views
Advice: Developing two projects where one is an extension of the other
The Two Projects
I work at a pretty small software company, and I'm currently in a situation where I'm at the end of development for "Project A", about to start development for "Project ...
- 428
42
votes
6
answers
15k
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 ...
9
votes
5
answers
674
views
How to manage the task of reviewing localized strings by a non-developer?
In .NET Framework, localized strings are located in an XML file (or multiple files). Those files are part of the project and are committed to the source control as any other source code file. Usually, ...
- 135k
3
votes
2
answers
248
views
Wiki/markup in enterprise as documentation [closed]
Why it is less common to use wiki/markup in enterprise as documentation?
They use Word document instead.
Wiki/markup are in text format, which is version control friendly.
- 1,160
0
votes
1
answer
1k
views
TFS SQL Deployment Data Script
We are using TFS and SQL Server 2005 (looking to upgrade to SQL Server 2012 if that makes a difference). We store our database schema in a Visual Studio Database project (VS 2010).
When code is ...
- 101
1
vote
3
answers
227
views
Which VCS is more applicable for our workflow?
Currently we have code stored on a shared network drive and do not use any kind of VCS. The code stored on our shared network drive is always being backed up. We would like to keep things as close ...
- 113
3
votes
2
answers
176
views
Best method to organize/manage dependencies in the VCS within a large solution
A simple scenario:
2 projects are in version control
The application
The test(s)
A significant number of checkins are made to the application daily.
CI builds and runs all of the automation ...
- 28.2k
10
votes
4
answers
5k
views
In Subversion, how should I set up a new major version of my application?
I'm about to start work on a new version (version 4) of my commercial application. I use Subversion.
Based on your experiences, mistakes, and successes, how would you recommend I set up the new ...
- 307
5
votes
4
answers
474
views
Is there tool agnostic terminology for source control activities?
My team is entering into some discussions on source control (process and possibly tools) and we would like a tool agnostic terminology for the various activities. The environment does have multiple (...
- 2,926
0
votes
1
answer
240
views
What is the basic process and tools needed for crawling a source code repository for the purpose of data mining?
This all is with respect to Microsoft project CodeBook:
CodeBook
There is huge amount of code in the repository, many classes , a call hierarchy of functions, testcases etc. I am interested in ...
- 13
16
votes
2
answers
23k
views
Structure of a Git repository
Sorry if this is a duplicate, I looked.
We're moving to Git. In Subversion, I'm used to having \trunk, \branches and \tags folders.
With Git, switching between branches will replace the contents of ...
- 719
4
votes
4
answers
467
views
Single statement non-braced ifs and code merges [duplicate]
I've seen code merges being used as an argument for bracing even single statement ifs. For example:
if (condition) {
do something;
}
Unfortunately I can't think of a change that would break a ...
- 143
1
vote
1
answer
140
views
Strategy for versioning on a public repo
Suppose I'm developing a (javascript) library which is hosted on a public repo (e.g. github). My aim in terms of how version numbers are assigned and incremented is to follow the guidelines of ...
- 113
2
votes
3
answers
305
views
Did a bunch of wrong work, should I keep it? [closed]
I have forked a repo and branched that clone to code a story, and because I didn't understand the problem, wrote code that isn't solving my task at hand, but may prove useful later.
Should I:
Delete ...
- 1,391
7
votes
6
answers
986
views
Why are tools like git-svn that allow git to integrate with svn useful? [closed]
I have read these related questions:
I'm a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS?
git for personal (one-man) projects. Overkill?
...and I ...
- 824
1
vote
2
answers
290
views
Agile project management, agile development: early integration
I believe that agile works if everything is agile.
In software development area, in my opinion, if team members' code is integrated early, code will be more in sync and this has a lot of pros:
Early ...
120
votes
18
answers
14k
views
When should I make the first commit to source control?
I'm never sure when a project is far enough along to first commit to source control. I tend to put off committing until the project is 'framework-complete,' and I primarily commit features from then ...
10
votes
7
answers
790
views
How to keep the trunk stable when tests take a long time?
We have three sets of test suites:
A "small" suite, taking only a couple of hours to run
A "medium" suite that takes multiple hours, usually ran every night (nightly)
A "large" suite that takes a ...
- 5,255
1
vote
1
answer
114
views
Keeping up with upstream changes while adding small fixes or even major changes
Often I need to apply some small fixes (to make them run on my environment) or even change some parts of the software (to tailor it to my needs) to software from outside. However this obviously ...
- 111
5
votes
1
answer
759
views
Should generated documentation go in version control history? [duplicate]
I'm against compiled stuff going into version control, specially when it comes to compiled binaries, however, my principles are now in question after adding doxygen support for a project.
Should the ...
- 14k
9
votes
2
answers
3k
views
How to structure git repositories for project?
I'm working on a content synchronisation module for Drupal. There is a server module, which sits on ona website and exposes content via a web service. There is a also a client module, which sits on ...
- 193
47
votes
8
answers
3k
views
Should I expect my team to have more than a basic proficiency with our source control system?
My company switched from Subversion to Git about three months ago. We had weeks of advance notice prior to the switch. Since I'd never used Git before (or any other DVCS), I read Pro Git and spent a ...
- 2,050
44
votes
9
answers
4k
views
Code maintenance: To add comments in code or to just leave it to the version control?
We have been asked to add comments with start tags, end tags, description, solution etc for each change that we make to the code as part of fixing a bug / implementing a CR.
My concern is, does this ...
- 591
7
votes
3
answers
2k
views
How do I structure code and builds for continuous delivery of multiple applications in a small team?
Background:
3-5 developers supporting (and building new) internal applications for a non-software company. We use TFS although I don't think that matters much for my question.
I want to be able to ...
- 173