Mercurial > hg
comparison tests/test-update-branches.t @ 34920:6a0e1d593bdd stable
commands: be more uniform in an "hg update" error message
"can only specify one of -C/--clean, -c/--check, or -m/merge"
becomes
"can only specify one of -C/--clean, -c/--check, or -m/--merge"
| author | muxator <a.mux@inwind.it> |
|---|---|
| date | Mon, 23 Oct 2017 22:45:24 +0200 |
| parents | 1644623ab096 |
| children | 02fdb8c018aa |
comparison
equal
deleted
inserted
replaced
| 34919:1856de4d1297 | 34920:6a0e1d593bdd |
|---|---|
| 182 updated to "bd10386d478c: 2" | 182 updated to "bd10386d478c: 2" |
| 183 1 other heads for branch "default" | 183 1 other heads for branch "default" |
| 184 parent=2 | 184 parent=2 |
| 185 | 185 |
| 186 $ revtest '-cC dirty linear' dirty 1 2 -cC | 186 $ revtest '-cC dirty linear' dirty 1 2 -cC |
| 187 abort: can only specify one of -C/--clean, -c/--check, or -m/merge | 187 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
| 188 parent=1 | 188 parent=1 |
| 189 M foo | 189 M foo |
| 190 | 190 |
| 191 $ revtest '-mc dirty linear' dirty 1 2 -mc | 191 $ revtest '-mc dirty linear' dirty 1 2 -mc |
| 192 abort: can only specify one of -C/--clean, -c/--check, or -m/merge | 192 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
| 193 parent=1 | 193 parent=1 |
| 194 M foo | 194 M foo |
| 195 | 195 |
| 196 $ revtest '-mC dirty linear' dirty 1 2 -mC | 196 $ revtest '-mC dirty linear' dirty 1 2 -mC |
| 197 abort: can only specify one of -C/--clean, -c/--check, or -m/merge | 197 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
| 198 parent=1 | 198 parent=1 |
| 199 M foo | 199 M foo |
| 200 | 200 |
| 201 $ echo '[commands]' >> .hg/hgrc | 201 $ echo '[commands]' >> .hg/hgrc |
| 202 $ echo 'update.check = abort' >> .hg/hgrc | 202 $ echo 'update.check = abort' >> .hg/hgrc |