equal
deleted
inserted
replaced
3 $ echo 1 > foo |
3 $ echo 1 > foo |
4 $ hg ci -Am1 # 0 |
4 $ hg ci -Am1 # 0 |
5 adding foo |
5 adding foo |
6 $ hg branch branchA |
6 $ hg branch branchA |
7 marked working directory as branch branchA |
7 marked working directory as branch branchA |
|
8 (branches are permanent and global, did you want a bookmark?) |
8 $ echo a1 > foo |
9 $ echo a1 > foo |
9 $ hg ci -ma1 # 1 |
10 $ hg ci -ma1 # 1 |
10 |
11 |
11 $ cd .. |
12 $ cd .. |
12 $ hg init tt |
13 $ hg init tt |
30 |
31 |
31 $ hg up 0 |
32 $ hg up 0 |
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33 $ hg branch branchB |
34 $ hg branch branchB |
34 marked working directory as branch branchB |
35 marked working directory as branch branchB |
|
36 (branches are permanent and global, did you want a bookmark?) |
35 $ echo b1 > foo |
37 $ echo b1 > foo |
36 $ hg ci -mb1 # 3 |
38 $ hg ci -mb1 # 3 |
37 |
39 |
38 $ cd ../tt |
40 $ cd ../tt |
39 |
41 |
137 |
139 |
138 $ hg up 6 |
140 $ hg up 6 |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 $ hg branch branchC |
142 $ hg branch branchC |
141 marked working directory as branch branchC |
143 marked working directory as branch branchC |
|
144 (branches are permanent and global, did you want a bookmark?) |
142 $ echo b1 > bar |
145 $ echo b1 > bar |
143 $ hg ci -Am "commit on branchC on tt" |
146 $ hg ci -Am "commit on branchC on tt" |
144 adding bar |
147 adding bar |
145 |
148 |
146 Make changes on default branch on t |
149 Make changes on default branch on t |