Mercurial > hg
comparison tests/test-commandserver.py.out @ 21404:ca275f7ec576
update: when deactivating a bookmark, print a message
This helps prevent user confusion when innocent-seeming commands like
'hg update -C .' are run.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 14 May 2014 12:49:55 -0700 |
| parents | 9336bc7dca8e |
| children | 10abc3a5c6b2 |
comparison
equal
deleted
inserted
replaced
| 21403:3db723e2dc20 | 21404:ca275f7ec576 |
|---|---|
| 175 | 175 |
| 176 testing phasecacheafterstrip: | 176 testing phasecacheafterstrip: |
| 177 | 177 |
| 178 runcommand update -C 0 | 178 runcommand update -C 0 |
| 179 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 179 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 180 (leaving bookmark bm3) | |
| 180 runcommand commit -Am. a | 181 runcommand commit -Am. a |
| 181 created new head | 182 created new head |
| 182 runcommand log -Gq | 183 runcommand log -Gq |
| 183 @ 5:731265503d86 | 184 @ 5:731265503d86 |
| 184 | | 185 | |