annotate en/examples/daily.copy @ 828:477d6a3e5023

Many final changes.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 04 May 2009 23:52:38 -0700
parents fe74ace5fe1c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
119
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 #!/bin/bash
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 #$ name: init
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 hg init my-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 cd my-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 echo line > file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 hg add file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 hg commit -m 'Added a file'
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 #$ name: clone
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 cd ..
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 hg clone my-copy your-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 #$ name: copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 cd my-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19 hg copy file new-file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
20
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
21 #$ name: status
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
22
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23 hg status
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
24
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
25 #$ name: status-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
26
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
27 hg status -C
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
28 hg commit -m 'Copied file'
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
29
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
30 #$ name: other
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
31
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
32 cd ../your-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
33 echo 'new contents' >> file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
34 hg commit -m 'Changed file'
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
35
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
36 #$ name: cat
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
37
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
38 cat file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
39 cat ../my-copy/new-file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
40
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
41 #$ name: merge
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
42
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
43 hg pull ../my-copy
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
44 hg merge
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
45 cat new-file
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
46
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
47 #$ name:
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
48
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
49 cd ..
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
50 hg init copy-example
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
51 cd copy-example
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
52 echo a > a
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
53 echo b > b
828
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
54 mkdir z
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
55 mkdir z/a
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
56 echo c > z/a/c
119
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
57 hg ci -Ama
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
58
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
59 #$ name: simple
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
60
183
fe74ace5fe1c Fix simple copy example.
Bryan O'Sullivan <bos@serpentine.com>
parents: 119
diff changeset
61 mkdir k
fe74ace5fe1c Fix simple copy example.
Bryan O'Sullivan <bos@serpentine.com>
parents: 119
diff changeset
62 hg copy a k
fe74ace5fe1c Fix simple copy example.
Bryan O'Sullivan <bos@serpentine.com>
parents: 119
diff changeset
63 ls k
119
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
64
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
65 #$ name: dir-dest
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
66
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
67 mkdir d
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
68 hg copy a b d
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
69 ls d
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
70
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
71 #$ name: dir-src
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
72
828
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
73 hg copy z e
119
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
74
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
75 #$ name: dir-src-dest
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
76
828
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
77 hg copy z d
119
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
78
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
79 #$ name: after
b252526b44aa Missed a file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
80
828
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
81 cp a n
477d6a3e5023 Many final changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 183
diff changeset
82 hg copy --after a n