equal
deleted
inserted
replaced
135 hg ci -m "b3 (HN)" |
135 hg ci -m "b3 (HN)" |
136 |
136 |
137 echo '% case NN: msg' |
137 echo '% case NN: msg' |
138 hg up -q null |
138 hg up -q null |
139 hg branch -f b |
139 hg branch -f b |
140 echo 1 > B |
140 echo 1 > bb |
141 hg ci -Am "b4 (NN): new topo root for branch b" |
141 hg ci -Am "b4 (NN): new topo root for branch b" |
142 |
142 |
143 echo '% case HN: no msg' |
143 echo '% case HN: no msg' |
144 echo 2 >> B |
144 echo 2 >> bb |
145 hg ci -m "b5 (HN)" |
145 hg ci -m "b5 (HN)" |
146 |
146 |
147 echo '% case BN: msg' |
147 echo '% case BN: msg' |
148 hg branch -f default |
148 hg branch -f default |
149 echo 1 > A |
149 echo 1 > aa |
150 hg ci -Am "a6 (BN): new branch root" |
150 hg ci -Am "a6 (BN): new branch root" |
151 |
151 |
152 echo '% case CN: msg' |
152 echo '% case CN: msg' |
153 hg up -q 4 |
153 hg up -q 4 |
154 echo 3 >> BB |
154 echo 3 >> bbb |
155 hg ci -Am "b7 (CN): regular new head" |
155 hg ci -Am "b7 (CN): regular new head" |
156 |
156 |
157 echo '% case BB: msg' |
157 echo '% case BB: msg' |
158 hg up -q 4 |
158 hg up -q 4 |
159 hg merge -q 3 |
159 hg merge -q 3 |