| Commit | Date | |
|---|---|---|
| 2013-04-06 16:05:38 | Tree | |
| 2013-04-02 02:51:55 | Tree | |
| 
             
                
                [r4458]
                
                
                by 
        
  
    
   cmpilato@gmail.com
    
                 
          * en/book/ch03-advanced-topics.xml  | 
          2013-03-20 13:52:29 | Tree | 
| 
             
                
                [r4457]
                
                
                by 
        
  
    
   cmpilato@gmail.com
    
                 
          * en/book/ch01-fundamental-concepts.xml  | 
          2013-03-20 13:48:28 | Tree | 
| 2013-03-20 13:40:49 | Tree | |
| 2013-03-11 21:51:40 | Tree | |
| 
             
                
                [r4454]
                
                
                by 
        
  
    
   ptburba
    
                 
          Add a dump of the sample repository used in the chapter 4 examples. * en/book/ch04-branching-and-merging.xml * en/book/sample-repositories/ch04-sample-repos.dump * en/book/sample-repositories/README  | 
          2013-03-11 17:04:42 | Tree | 
| 
             
                
                [r4453]
                
                
                by 
        
  
    
   ptburba
    
                 
          Last of the chapter 4 review and update for 1.8 (for now at * en/book/ch04-branching-and-merging.xml (svn.branchmerge.advanced.moves): Use sample repos for (svn.branchmerge.advanced.pre1.5clients): Rename a section (svn.branchmerge.advanced.finalword): Back off on the "merge (svn.branchmerge.maint.lifetime): Tweak examples to use the sample (svn.branchmerge.commonpatterns.release): Use the term (svn.branchmerge.commonpatterns.feature): Use the new "automatic" (svn.branchmerge.summary.tbl-1): Remove the deprecated --reintegrate  | 
          2013-02-26 23:23:29 | Tree | 
| 
             
                
                [r4452]
                
                
                by 
        
  
    
   ptburba
    
                 
          More chapter 4 review and update for 1.8. * en/book/ch04-branching-and-merging.xml (svn.branchmerge.using.create): Correct a type in an example (svn.branchmerge.basicmerging.stayinsync): Tweak definition of (svn.branchmerge.basicmerging.reintegrate): Add 'reintegrate merge' (svn.branchmerge.advanced.advancedsyntax): Use the term automatic (svn.branchmerge.advanced.mergeconflicts): Wording tweaks and change (svn.branchmerge.advanced.blockchanges): Change examples to use (svn.branchmerge.advanced.reintegratetwice): Remove this section, it (svn.branchmerge.advanced.logblame): Update examples using sample repos. (svn.branchmerge.advanced.ancestry): Add 'merge tracking, disabling'  | 
          2013-02-26 01:10:55 | Tree | 
| 
             
                
                [r4451]
                
                
                by 
        
  
    
   stsp@elego.de
    
                 
          * en/book/ch04-branching-and-merging.xml: Properly close <command> tag to  | 
          2013-02-25 09:51:03 | Tree |