Commits

Arne Babenhauserheide  committed 0936104

polish polish

  • Participants
  • Parent commits afaacc1
  • Branches subversion

Comments (0)

Files changed (1)

File hg-intro.org

 
 ***                                                                   :BMCOL:
     :PROPERTIES:
-    :BEAMER_col: 0.45
+    :BEAMER_col: 0.3
     :END:
 
 ****                                                                :B_block:
 ***                                                           :B_block:BMCOL:
     :PROPERTIES:
     :BEAMER_env: block
-    :BEAMER_col: 0.62
+    :BEAMER_col: 0.6
     :END:
 - =update=: Change the working copy to another version
-- =branch=: Collect the followiing commits under a name
+- =branch=: Collect the following commits under a name
 - =merge=: Combine two branches
 
 ** Example: Branch and Tag
 - broken subrepo, *broken parent*
 - thin shell: Most resilient. Replaceable
 
-*** path rewriting                                                  :B_block:
+*** path rewriting in =.hgsub=                                      :B_block:
     :PROPERTIES:
     :BEAMER_env: block
     :END:
 #+BEGIN_SRC ditaa :file hg-init-project.png 
                  v0.1                             +-----------------------\
   +--------------------\            merge back    | 10 muorrc cBLU        |
-  | 8 mnscr            |------------------------->| merge base            |                         
-  | document (grafted) |<-\                       | branch flexdiff       |                         
+  | 8 mnscr            |------------------------->| merge base            |
+  | document (grafted) |<-\                       | branch flexdiff       |
   \--------------------+  |                       \-----------------------+
      ^                    : graft                    ^                     
      |                    |                          |                     
   +--+-------------\   +--+--------------------\  +--+--------------------\
   | 6 cricrcr      |   | 7 mucorc cRED         |  | 5 muorrc cGRE         |
-  | quick hack     |   | document              |  | document              |                      
+  | quick hack     |   | document              |  | document              |
   \----------------+   | branch grav-advect    |  | branch flexdiff       |
      ^                 \-----------------------+  \-----------------------+
      |                   ^                          ^