Changes between Version 3 and Version 4 of UfoRevisionControl

Timestamp:

Feb 19, 2011, 2:37:20 PM (14 years ago)

Author:

Matthias Vogelgesang

Comment:

--

UfoRevisionControl

@@ -44 +44 @@
 There are already very good branching [http://nvie.com/posts/a-successful-git-branching-model/ models] out there. Although it's up to everyone how he will work on his personal branches, I will show how I use Bazaar to ease my life.
 
-First of all, I import some of the written code using the steps written above. Then I clean the project directory and clone the committed code as a named branch and bind to the server:
+First of all, I import some of the written code using the steps written above. 
 {{{
+cd project-dir
+bzr init .
+bzr add *
+bzr commit
+bzr init bzr+ssh://user@ufo.kit.edu/user/project
+bzr push bzr+ssh://user@ufo.kit.edu/user/project
+}}}
+
+Then I clean the project directory and clone the committed code as a named branch and bind to the server:
+{{{
+rm -rf *
 bzr clone bzr+ssh://user@ufo.kit.edu/user/project upstream
-cd upstream && bzr bzr bind bzr+ssh://user@ufo.kit.edu/user/project
+cd upstream
+bzr bind bzr+ssh://user@ufo.kit.edu/user/project
 }}}
 I ''never'' work directly in the upstream branch because every commit would be visible immediatly. Therefore, I branch from the `upstream` branch a local branch where development happens:
 {{{
+cd ..
 bzr clone upstream/ local
 }}}
 Whenever I need to work on the same project but tackling different problems, I branch from the `local` branch to a feature specific branch. To push my changes, I just pull (no merging needed) the changes from the `local` branch into the `upstream` branch
 {{{
-cd upstream && bzr pull ../local
+cd upstream
+bzr pull ../local
 }}}
 
@@ -63 +77 @@
 
 [[Image(branch-model.png)]]
+[[Image(branch-model.png)]]