comparison en/examples/branch-named @ 206:6519f3b983b4

More material about named branches.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 23 Apr 2007 15:28:13 -0700
parents d7615e15510f
children 2936cb7eae7a
comparison
equal deleted inserted replaced
205:c76a3e2a600c 206:6519f3b983b4
27 #$ name: commit 27 #$ name: commit
28 28
29 echo 'hello again' >> myfile 29 echo 'hello again' >> myfile
30 hg commit -m 'Second commit' 30 hg commit -m 'Second commit'
31 hg tip 31 hg tip
32
33 #$ name: rebranch
34
35 hg branch
36 hg branch bar
37 echo new file > newfile
38 hg commit -A -m 'Third commit'
39 hg tip
40
41 #$ name: parents
42
43 hg parents
44 hg branches
45
46 #$ name: update-switchy
47
48 hg update foo
49 hg parents
50 hg update bar
51 hg parents
52
53 #$ name: update-nothing
54
55 hg update foo
56 hg update
57
58 #$ name: foo-commit
59
60 echo something > somefile
61 hg commit -A -m 'New file'
62 hg heads
63
64 #$ name: update-bar
65
66 hg update bar
67 hg update -C bar
68
69 #$ name: merge
70
71 hg branch
72 hg merge
73 hg commit -m 'Merge'
74 hg tip