Mercurial > public > mercurial-scm > hg
comparison mercurial/ui.py @ 34707:6cd8d8203204
tweakdefaults: make commands.update.check be `noconflict`
This is the second-safest option we have to offer in `updatecheck`,
with `abort` being the safest and `linear` being the default. At the
sprint we discussed how much `none` and `linear` make us all
uncomfortable, and how we'd like to move the default behavior if we can.
I'm not sure we can get away with actually changing the out of the box
default behavior, but we can at *least* do this.
Differential Revision: https://phab.mercurial-scm.org/D1062
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 13 Oct 2017 15:58:54 -0400 |
| parents | 75979c8d4572 |
| children | 9f2891fb426c |
comparison
equal
deleted
inserted
replaced
| 34706:8782076874f5 | 34707:6cd8d8203204 |
|---|---|
| 51 rollback = False | 51 rollback = False |
| 52 | 52 |
| 53 [commands] | 53 [commands] |
| 54 # Make `hg status` emit cwd-relative paths by default. | 54 # Make `hg status` emit cwd-relative paths by default. |
| 55 status.relative = yes | 55 status.relative = yes |
| 56 # Refuse to perform an `hg update` that would cause a file content merge | |
| 57 update.check = noconflict | |
| 56 | 58 |
| 57 [diff] | 59 [diff] |
| 58 git = 1 | 60 git = 1 |
| 59 """ | 61 """ |
| 60 | 62 |