hgbook

diff en/examples/daily.files @ 117:6b0f4498569e

Beef up daily routine material. Focus on merge-across-copy.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Nov 14 15:11:22 2006 -0800 (2006-11-14)
parents 6f37e6a7d8cd
children 5b034c2b74f7
line diff
     1.1 --- a/en/examples/daily.files	Sun Jul 23 23:38:41 2006 -0700
     1.2 +++ b/en/examples/daily.files	Tue Nov 14 15:11:22 2006 -0800
     1.3 @@ -2,21 +2,96 @@
     1.4  
     1.5  #$ name: add
     1.6  
     1.7 -hg init a
     1.8 -cd a
     1.9 -echo content > filename
    1.10 -mkdir subdir
    1.11 -echo something > subdir/otherfile
    1.12 +hg init add-example
    1.13 +cd add-example
    1.14 +echo a > a
    1.15  hg status
    1.16 +hg add a
    1.17 +hg status
    1.18 +hg commit -m 'Added one file'
    1.19 +hg status
    1.20 +
    1.21 +#$ name: add-dir
    1.22 +
    1.23 +mkdir b
    1.24 +echo b > b/b
    1.25 +echo c > b/c
    1.26 +mkdir b/d
    1.27 +echo d > b/d/d
    1.28 +hg add b
    1.29 +hg commit -m 'Added all files in subdirectory'
    1.30 +
    1.31 +#$ name:
    1.32 +
    1.33 +cd ..
    1.34  
    1.35  #$ name: hidden
    1.36  
    1.37 +hg init hidden-example
    1.38 +cd hidden-example
    1.39  mkdir empty
    1.40  touch empty/.hidden
    1.41  hg add empty/.hidden
    1.42  hg commit -m 'Manage an empty-looking directory'
    1.43  ls empty
    1.44  cd ..
    1.45 -hg clone a b
    1.46 -ls b
    1.47 -ls b/empty
    1.48 +hg clone hidden-example tmp
    1.49 +ls tmp
    1.50 +ls tmp/empty
    1.51 +
    1.52 +#$ name:
    1.53 +
    1.54 +cd ..
    1.55 +
    1.56 +#$ name: remove
    1.57 +
    1.58 +hg init remove-example
    1.59 +cd remove-example
    1.60 +echo a > a
    1.61 +mkdir b
    1.62 +echo b > b/b
    1.63 +hg add a b
    1.64 +hg commit -m 'Small example for file removal'
    1.65 +hg remove a
    1.66 +hg status
    1.67 +hg remove b
    1.68 +
    1.69 +#$ name:
    1.70 +
    1.71 +cd ..
    1.72 +
    1.73 +#$ name: missing
    1.74 +hg init missing-example
    1.75 +cd missing-example
    1.76 +echo a > a
    1.77 +hg add a
    1.78 +hg commit -m'File about to be missing'
    1.79 +rm a
    1.80 +hg status
    1.81 +
    1.82 +#$ name: remove-after
    1.83 +
    1.84 +hg remove --after a
    1.85 +hg status
    1.86 +
    1.87 +#$ name: recover-missing
    1.88 +hg revert a
    1.89 +cat a
    1.90 +hg status
    1.91 +
    1.92 +#$ name:
    1.93 +
    1.94 +cd ..
    1.95 +
    1.96 +#$ name: addremove
    1.97 +
    1.98 +hg init addremove-example
    1.99 +cd addremove-example
   1.100 +echo a > a
   1.101 +echo b > b
   1.102 +hg addremove
   1.103 +
   1.104 +#$ name: commit-addremove
   1.105 +
   1.106 +echo c > c
   1.107 +hg commit -A -m 'Commit with addremove'