[MERGE] make 'push' default to parent branch

Stephen J. Turnbull stephen at xemacs.org
Thu Jul 31 00:32:48 BST 2008


Robert Collins writes:

 > So, drawing the conversation back around; we have a default which fits
 > gatekeeper based workflow (assumes you can't push to the place you
 > branched from); it sounds like we should expect to the first VCS many
 > users use (I still can't quite believe this!) AND that the first place
 > bzr is used by them will be on their own project.

I don't know if I would say that in an absolute sense.  The feeling I
get is that there is a lot of leverage associated with being the first
VCS *chosen* by a developer.  These are people who are likely to
develop an attachment to that tool, probably report bugs more often
than others, probably become code/doc contributors more than others.

As pointed out before, if you can't push, you smack your forehead and
move on.  So I don't think that making push default to :parent will
bother people much.

Regarding that, btw, one thing that might be worth some skull sweat is
figuring out the relationship between 'bzr diff' and 'bzr send' as
means of submitting changesets.  I know this has come up on this list,
and with Bundle Buggy 'bzr send' greatly automates the process.  But
Bundle Buggy seems to get us back into a world of substantial admin
effort before things start working.

BTW, the help for 'bzr send' is unclear:

    Merge directives are applied using the merge command or the pull
    command.

I would recommend rephrasing this as

    The merge directives created by bzr send may be applied using bzr
    merge or bzr pull by specifying a file containing the merge
    directives as the location.

And the help for 'bzr merge' and 'bzr pull' should probably mention
'bzr send' in the See also: field.

(Sorry for this informal bug report, but I've forgotten my Launchpad
password so by the time I get it -- probably several hours from now
due to grey listing -- I'll probaby have forgotten to file a bug....
Death to spammers.)



More information about the bazaar mailing list