Mercurial > hg
comparison tests/test-update-branches.t @ 29964:40f845537dca
update: use single quotes in use warning
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 02 Sep 2016 21:49:33 +0000 |
parents | e1f0ec0b7d2d |
children | 23eed7d423b4 |
comparison
equal
deleted
inserted
replaced
29963:e824de573112 | 29964:40f845537dca |
---|---|
193 $ hg update -q -C 3 | 193 $ hg update -q -C 3 |
194 $ hg commit --close-branch -m 6 | 194 $ hg commit --close-branch -m 6 |
195 $ norevtest "on closed branch head" clean 6 | 195 $ norevtest "on closed branch head" clean 6 |
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
197 no open descendant heads on branch "default", updating to a closed head | 197 no open descendant heads on branch "default", updating to a closed head |
198 (committing will reopen the head, use `hg heads .` to see 1 other heads) | 198 (committing will reopen the head, use 'hg heads .' to see 1 other heads) |
199 parent=6 | 199 parent=6 |
200 | 200 |
201 if descendant non-closed branch head exists, and it is only one branch head: | 201 if descendant non-closed branch head exists, and it is only one branch head: |
202 - update to it, even if its revision is less than closed one | 202 - update to it, even if its revision is less than closed one |
203 - "N other heads for ...." message isn't displayed | 203 - "N other heads for ...." message isn't displayed |
212 - "N other heads for ...." message is displayed | 212 - "N other heads for ...." message is displayed |
213 | 213 |
214 $ norevtest "all descendant branch heads are closed" clean 3 | 214 $ norevtest "all descendant branch heads are closed" clean 3 |
215 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 215 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
216 no open descendant heads on branch "default", updating to a closed head | 216 no open descendant heads on branch "default", updating to a closed head |
217 (committing will reopen the head, use `hg heads .` to see 1 other heads) | 217 (committing will reopen the head, use 'hg heads .' to see 1 other heads) |
218 parent=6 | 218 parent=6 |
219 | 219 |
220 Test updating if all branch heads are closed | 220 Test updating if all branch heads are closed |
221 | 221 |
222 if on the closed branch head: | 222 if on the closed branch head: |