equal
deleted
inserted
replaced
115 |
115 |
116 $ hg branch $S |
116 $ hg branch $S |
117 marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc) |
117 marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc) |
118 (branches are permanent and global, did you want a bookmark?) |
118 (branches are permanent and global, did you want a bookmark?) |
119 $ hg tag $S |
119 $ hg tag $S |
|
120 $ hg book -f $S |
120 $ hg branch $M |
121 $ hg branch $M |
121 marked working directory as branch MIDDLE_ |
122 marked working directory as branch MIDDLE_ |
122 (branches are permanent and global, did you want a bookmark?) |
123 (branches are permanent and global, did you want a bookmark?) |
123 $ hg tag $M |
124 $ hg tag $M |
|
125 $ hg book -f $M |
124 $ hg branch $L |
126 $ hg branch $L |
125 marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
127 marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
126 (branches are permanent and global, did you want a bookmark?) |
128 (branches are permanent and global, did you want a bookmark?) |
127 $ hg tag $L |
129 $ hg tag $L |
|
130 $ hg book -f $L |
128 |
131 |
129 check alignment of branches |
132 check alignment of branches |
130 |
133 |
131 $ hg branches |
134 $ hg branches |
132 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) |
135 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) |
140 tip 5:d745ff46155b |
143 tip 5:d745ff46155b |
141 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 4:9259be597f19 (esc) |
144 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 4:9259be597f19 (esc) |
142 MIDDLE_ 3:b06c5b6def9e |
145 MIDDLE_ 3:b06c5b6def9e |
143 \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc) |
146 \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc) |
144 |
147 |
145 $ cd .. |
148 check alignment of bookmarks |
|
149 |
|
150 $ hg book |
|
151 MIDDLE_ 5:d745ff46155b |
|
152 \xe7\x9f\xad\xe5\x90\x8d 4:9259be597f19 (esc) |
|
153 * \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) |