Changes between Version 13 and Version 14 of DarcsEvaluation


Ignore:
Timestamp:
Jul 23, 2008 8:55:11 PM (7 years ago)
Author:
igloo
Comment:

whitespace-only

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v13 v14  
    5050 
    5151{{{ 
    52     # Make a repo with a single file with lines 1,3,5,7 in 
    53  
    54     mkdir repo1 
    55     cd repo1 
    56     darcs init 
    57     printf 'Line1\nLine3\nLine5\nLine7\n' > file 
    58     darcs record --all --look-for-adds -m patch1 -A [email protected] 
    59     cd .. 
    60  
    61     # Check out 2 copies of the repo 
    62  
    63     darcs get repo1 repo2 
    64     darcs get repo1 repo3 
    65  
    66     # Add a patch that adds lines 2 and 6, then another that adds line 4 
    67  
    68     cd repo1 
    69     printf 'Line1\nLine2\nLine3\nLine5\nLine6\nLine7\n' > file 
    70     darcs record --all -m patch2 
    71     printf 'Line1\nLine2\nLine3\nLine4\nLine5\nLine6\nLine7\n' > file 
    72     darcs record --all -m patch3 
    73  
    74     # Pull the line 4 patch, but not the lines 2 and 6 patch, into the 
    75     # other repos non-interactively and interactively 
    76  
    77     cd ../repo2 
    78     darcs pull --all --patches patch3 
    79     cd ../repo3 
    80     darcs pull  
    81     n 
    82     y 
    83  
    84     # repo2's and repo3's file now contains lines 1,3,4,5,7 
     52# Make a repo with a single file with lines 1,3,5,7 in 
     53 
     54mkdir repo1 
     55cd repo1 
     56darcs init 
     57printf 'Line1\nLine3\nLine5\nLine7\n' > file 
     58darcs record --all --look-for-adds -m patch1 -A [email protected] 
     59cd .. 
     60 
     61# Check out 2 copies of the repo 
     62 
     63darcs get repo1 repo2 
     64darcs get repo1 repo3 
     65 
     66# Add a patch that adds lines 2 and 6, then another that adds line 4 
     67 
     68cd repo1 
     69printf 'Line1\nLine2\nLine3\nLine5\nLine6\nLine7\n' > file 
     70darcs record --all -m patch2 
     71printf 'Line1\nLine2\nLine3\nLine4\nLine5\nLine6\nLine7\n' > file 
     72darcs record --all -m patch3 
     73 
     74# Pull the line 4 patch, but not the lines 2 and 6 patch, into the 
     75# other repos non-interactively and interactively 
     76 
     77cd ../repo2 
     78darcs pull --all --patches patch3 
     79cd ../repo3 
     80darcs pull  
     81n 
     82y 
     83 
     84# repo2's and repo3's file now contains lines 1,3,4,5,7 
    8585}}} 
    8686