=== c74d is now known as Guest21388
[06:57] <CcxCZ> is bzr-externals still the thing to manage related branches? or is there something nicer I'm not aware of?
=== c74d is now known as Guest61567
[23:17] <MarkyC> Hey, I'm a gitter. I'd like to contribute to lp:scratch. I've done bzr branch lp:scratch and made some changes (haven't committed them yet)
[23:18] <MarkyC> I'd like to move my changes to a branch bugfix-1080904 and push them to my launchpad repo so I can make a merge request. Can someone assist me with this?
[23:19] <fullermd> What you call the branch on LP and what you call it locally don't have any necessary relation.  So the simplest thing is just commit and push.
[23:20] <MarkyC> I feel like if I push it may think I'm trying to push into "master" (or the bzr equivalent)
[23:21] <fullermd> Well, remember, in bzr the thing you're push'ing around (and branch'ing initially) isn't a "repo" with branches in it, it's a single branch.
[23:21] <fullermd> It doesn't have any "name", apart from the URL or path or whatever access schemata.
[23:22] <MarkyC> forgive me; before today, I've only heard of bzr, but never actually worked with it
[23:22] <fullermd> Hey, if it weren't for people in that situation, I'd have nothing to do here   ;)
[23:23] <fullermd> If you were doing long-term ongoing stuff, there are alternate workspace/etc setups you'd want to investigate.
[23:23] <MarkyC> I see on this page ( https://code.launchpad.net/~elementary-apps/scratch/scratch/+activereviews ) the other committers all have branches beginning with their names then scratch (the project I'm committing to), then their "feature branch name", so if I just add, commit, and push, I'll have something similar?
[23:24] <fullermd> But for a oneoff, "bzr branch lp:whatever ; <hack> ; bzr push lp:~/whatever/bugfix-12345" or the like works fine.
[23:24] <fullermd> Yeah, the LP scheme is something like <user>/<project>/<branch>; it uses that internally to tie stuff together.
[23:24] <fullermd> (technically a LP thing, not a bzr thing)
[23:25] <fullermd> I _think_ LP properly expands bare "~" to "~you"; if not you might have to spell out your username there.
[23:26] <MarkyC> fullermd: I see, thank you. One more question though: does bzr commit (without the -m flag) open up a vim editor for me to write my commit message in?
[23:26] <fullermd> Should pop up $EDITOR like most other programs, yeah.
[23:26] <fullermd> Or $VISUAL, etc.