background preloader

SCM

Facebook Twitter

A successful Git branching model » nvie.com. Note of reflection (March 5, 2020)This model was conceived in 2010, now more than 10 years ago, and not very long after Git itself came into being. In those 10 years, git-flow (the branching model laid out in this article) has become hugely popular in many a software team to the point where people have started treating it like a standard of sorts — but unfortunately also as a dogma or panacea.During those 10 years, Git itself has taken the world by a storm, and the most popular type of software that is being developed with Git is shifting more towards web apps — at least in my filter bubble.

Web apps are typically continuously delivered, not rolled back, and you don't have to support multiple versions of the software running in the wild.This is not the class of software that I had in mind when I wrote the blog post 10 years ago. Why git? ¶ For a thorough discussion on the pros and cons of Git compared to centralized source code control systems, see the web. The main branches ¶ develop.

Bazaar

General discussion about tortoisehg, a GUI for mercurial. Subversion. SVN::Notify::Mirror::SSH. SVN::Notify::Mirror::SSH - Mirror a repository path via SSH Use svnnotify in post-commit: svnnotify --repos-path "$1" --revision "$2" \ --handler Mirror::SSH --to "/path/to/www/htdocs" \ [--svn-binary /full/path/to/svn] \ [[--ssh-host remote_host] [--ssh-user remote_user] \ [--ssh-tunnel 10.0.0.2] \ [--ssh-identity /home/user/.ssh/id_rsa]] or better yet, use SVN::Notify::Config for a more sophisticated setup: --- '': PATH: "/usr/bin:/usr/local/bin" 'path/in/repository': handler: Mirror to: "/path/to/www/htdocs" 'some/other/path/in/repository': handler: Mirror::SSH to: "/path/to/remote/www/htdocs" ssh-host: "remote_host" ssh-user: "remote_user" ssh-tunnel: "10.0.0.2" ssh-identity: "/home/user/.ssh/id_rsa" Keep a directory in sync with a portion of a Subversion repository.

Depending on whether the target is a "Local Mirror" or a "Remote Mirror", there are different options available. Working Copy on Mirror <DirectoryMatch "^/.*/\.svn/"> Order deny,allow Deny from all </DirectoryMatch> 1. 2. 3. TortoiseSVN. TortoiseCVS: About. Bazaar in five minutes — Bazaar v2.2.0dev1 documentation. Introduction Bazaar is a distributed version control system that makes it easier for people to work together on software projects. Over the next five minutes, you’ll learn how to put your files under version control, how to record changes to them, examine your work, publish it and send your work for merger into a project’s trunk. Introducing yourself Bazaar records changes to source code, and it records who made the change. The person is identified by their name and email address.

(If you’re concerned about spam, you don’t need to use a real address that you actually read, but the convention is that it looks like an email address.) Before you start working, let’s tell Bazaar who you are. . $ bzr whoami "John Doe <john.doe@gmail.com>" You can check what identity is stored in Bazaar’s configuration: $ bzr whoami John Doe <john.doe@gmail.com> Starting a new project Let’s suppose we want to store a new project under Bazaar. Adding files and then commit, which saves a snapshot of all versioned files: Wiki: Subversion/Configuration.