58 Commits

Author SHA1 Message Date
Mike McQuaid
237b70168e bottle: set bottle block tap.
Avoids issues when using `—keep-old`
2016-09-11 17:33:39 +01:00
Mike McQuaid
ad3359b96e Merge pull request #916 from MikeMcQuaid/bottle-old-value
bottle: fix old_value/value ordering for --merge.
2016-09-11 10:39:58 +01:00
Mike McQuaid
be6876c79a bottle: fix old_value/value ordering for --merge.
Previously this was the wrong way around causing it to not be accepting
enough on e.g. a bump from :any to :any_no_relocation.
2016-09-10 21:15:28 +01:00
Mike McQuaid
d0c33b3705 bottle: use key/value rather than field.
Consistent naming is good.
2016-09-10 19:43:49 +01:00
Mike McQuaid
ea5da9b592 bottle: further improve --keep-old mismatching.
- Make the code more similar between `bottle` and `bottle --merge`.
- Also output the mismatched values when using `--merge`.
2016-09-10 16:12:27 +01:00
Mike McQuaid
44ba4583b7 bottle: improve --keep-old failure output.
If fields have changed: tell the user what they were before and are
afterwards.
2016-09-10 10:13:33 +01:00
Mike McQuaid
86bfd36af2 Don't hide some (now) developer commands. 2016-09-08 20:46:37 +01:00
Mike McQuaid
af8605ea4b Move developer-focused commands to dev-cmd. 2016-09-08 20:46:37 +01:00