4 ms·
They are missing the creatieve use of your version control system. First, make sure none of your commits actually build out of the box; forget a file for a few
by Someone 11y ago
They are missing the creatieve use of your version control system.
First, make sure none of your commits actually build out of the box; forget a file for a few revisions, accidentally check in a corrupted XML file, etc.
Create a "trunkV2" directory, and keep committing to both trunk and trunkV2. Add a third trunk inside the "branches" tree (/branches/featureX/newTrunk; I have seen this n practice, with random customer branches sprinkled in)
In the tree of the service that your program calls, do something different, for example by starting with a simple tag 'V1 frozen', adding the revisions of the V2 version and then occasionally unfreezing the V1 one by committing a combined "undo everything since V1" and "tiny fix to the v1 protocol that we thought was frozen", followed by an "undo that, and do something else" commit. Make sure to comment those commits as "version for customer X" and "bug fix #3 for customer Y"; do not mention "V1" or "V2".
Also, make sure that "customer X" has both V1 and V2 deployed, so that future developers cannot learn that "customer X" implies "version 2".
- adrianN 11y agoYou can also use a version control system like ClearCase that doesn't have the concept of an atomic commit of multiple files. Work on several features at once and check in the changes in a random order. Make sure not to leave helpful check-in comments.
- laurent123456 11y agoAlso a nice thing to do is to split the project into multiple repositories, each also split into multiple branches. Then when a dev checkout a branch in one repo, they need to find and checkout the matching branches in the other repos in order to build the project. To make it more fun you can name the branches slightly differently from one repo to another, like "mybranch3" in one, and "my_branch3" in another. Sometime a feature only affects one repository. That's fine - just create a branch there, and leave the other repo to the default branch - "master" (or sometime "release", unless it's "current_test", or maybe "dev-temp", or...).
- TorKlingberg 11y agoAlso make sure your build system only works with a specific combination of Windows XP, cygwin and ActivePerl.
- bazzargh 11y agoOne I saw happen: avoid merge conflicts by having each developer maintain their own fork of trunk, or better still, multiple forks. Copy and paste is easier than merge anyway. Automate builds for all these, and provide a way to release any of them, without recording which you used. Never, ever tag. You want to delete branches too? Sure, why not. Of course this makes it hard to track dependencies, so be sure to check in the binaries of the projects you depend on into your project, especially if those were built on your own machine from source you haven't checked in instead of builds from the build server. (and when I say 'saw happen', I mean 'I spent a week in Kiev at 12 degrees below freezing trying to figure out where the source code had gone'...we never found all of it)
- aidenn0 11y agoIn Subversion, I've seen branches created, deleted, and then another branch created with the same name from a different subtree of the repository. I was also successfully able to export all of this to git with every deleted branch now still in existence.
- tracker1 11y agoI definitely like the git workflow more... branch, work, rebase, PR, review, rework, rebase, review... merge. short change cycles are easier to reason with.
- golergka 11y agoAlso, use git rebase instead of merge.
- louden 11y agoWithin the same repo, have two branches: database and Database and alternate between them.
- kraftman 11y agoBranching: Copy folder X, paste it and name it 'X-branch-<date>' Make sure that <date> is not in the same format as any previously used, if you run out of formats, change the ordering or add your name, e.g.: '140215-kraftman-MAIN-BRANCH2'
- tempodox 11y agoYes, I'm sure that git can irrevocably destroy any source code, you don't even need to know anything about git for that. As an added bonus, you can have as much differently broken “repositories” of the same project as you like.