Equivalent to Mercurial's 'fetch'
mbp at canonical.com
Fri May 30 05:40:49 BST 2008
On Fri, May 30, 2008 at 2:16 PM, Ben Finney <ben at benfinney.id.au> wrote:
> Does Bazaar support such automatically-committed merges? If not,
> what's the reasoning?
Not at present. You can of course write
bzr merge --pull && bzr commit -m "auto merge"
and that will be functionally equivalent, since the second command
will not run if there are conflicts.
We don't generally auto-commit merges for a few reasons. One is that
users may want to check the merge was semantically correct as well as
having no technical conflicts, eg by looking at the diff or running
some tests. Another is that there is some potential for user
confusion if you sometimes have to explicitly commit and sometimes
But I think there would be no harm in at least having an option for
this for people who like it. I would probably put it on merge rather
than having a new command.
The other aspect, pivoting this branch out so it looks like the merge
happened in the other direction, would probably also be reasonable to
have as an option to reduce the number of steps.
More information about the bazaar