| SpecialK|Canon | sigh | 12:12 |
|---|---|---|
| SpecialK|Canon | tests don't work so well when you run them on the wrong branch | 12:13 |
| ilasc | I know the feeling ... | 12:20 |
| SpecialK|Canon | re earlier conversation, I've been meaning to look at https://github.com/asottile/pyupgrade | 14:24 |
| SpecialK|Canon | Neat for stripping out 2-isms from pure-3 code | 14:26 |
| SpecialK|Canon | ...it will also auto-f-string, about which I have Feelings (TM), but hey ho | 14:27 |
| tomwardill | ... no | 14:48 |
| tomwardill | https://code.launchpad.net/~twom/launchpad-buildd/initial-docker-build-support/+merge/369775 is ready for re-review I think | 14:57 |
| cjwatson | tomwardill: queued up. (you have at least one conflict marker in there ... maybe worth going over the diff yourself) | 14:58 |
| tomwardill | ergh, thought I'd fixed that | 14:58 |
| * tomwardill fixes again | 14:58 | |
| tomwardill | although it has just occurred to me that I've not tried it in an environment that needs a HTTP proxy for outgoing connections | 15:01 |
| * tomwardill diverts into 'how to make a proxy' | 15:15 | |
| SpecialK|Canon | Should I expect --force-with-lease to Just Work when pushing to lp:~doismellburning/turnip? I'm getting rejected with not much context - https://pastebin.canonical.com/p/FDvkYCvpMY/ | 16:31 |
| cjwatson | I think that means that your local ref is stale for some reason | 16:37 |
| cjwatson | Oh err that invocation is weird | 16:37 |
| cjwatson | Normally you'd use --force-with-lease with a proper remote name, since it wants to know what the expected contents of that ref are | 16:38 |
| cjwatson | Do you have something like a "doismellburning" remote configured to point to lp:~doismellburning/turnip ? | 16:38 |
| cjwatson | Then you'd use git push --force-with-lease doismellburning feature/readme-rst | 16:38 |
| cjwatson | Liberal use of tab-completion recommended there | 16:38 |
| SpecialK|Canon | Ahhh I hadn't appreciated that you could pass a refname to fwl - that'll do it | 16:45 |
| SpecialK|Canon | I've also managed today to inadvertently push two branches to lp:turnip - I didn't realise I could, or expect to be able to, do that, and I can't figure out how to delete them | 16:46 |
| SpecialK|Canon | but after that I started explicitly specifying where I was pushing | 16:46 |
| SpecialK|Canon | I've got the GH-y fork-model embedded deep in my muscle memory so I habitually just "git push" with no further qualification | 16:48 |
| cjwatson | git push --delete origin <names of branches> | 16:51 |
| cjwatson | Even with GH, I always give the upstream repo a remote name of "origin" and name my fork "cjwatson", so I can "git push cjwatson <branch>" | 16:51 |
| cjwatson | We could protect everything under lp:turnip but haven't yet/currently done so | 16:52 |
| cjwatson | If you delete those branches then I'll apply some more protection | 16:53 |
| SpecialK|Canon | cjwatson: deleted, thanks | 16:55 |
| cjwatson | SpecialK|Canon: And protected further (https://code.launchpad.net/~launchpad/turnip/+git/turnip/+permissions) | 16:56 |
| cjwatson | And I've done likewise for lp:launchpad | 16:57 |
| SpecialK|Canon | cjwatson: Yay, thank you | 16:57 |
| SpecialK|Canon | And you were right about stale info - I'd missed that I hadn't actually ever fetched lp:~doismellburning/turnip in that clone | 16:58 |
| cjwatson | https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/378344 - buildbot fix, if somebody could review that | 17:29 |
| pappacena | Done! | 17:58 |
| cjwatson | thanks | 18:11 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!