[PATCH] push to diverged branch
Matthieu.Moy at imag.fr
Mon Oct 16 06:29:48 BST 2006
Martin Pool <mbp at canonical.com> writes:
>> I don't think that's right, and I think it will confuse people alot.
> ('bzr push' alone won't push back to the place you branched from.
> You need to give the url.)
Yes, but you got the message by calling "push" with or without the
URL, so a message telling you to use "push" again implicitely suggests
to use it with the same parameters.
> It might be nice if you could do an 'update' from trunk into featureX,
> making your new work into pending merges in the working tree, rebased
> onto the tip of trunk.
That just means allowing "update" for non-bound branches. This should
be fairly easy to implement. I'm not sure how intuitive this is, and
I'd probably prefer an option to "merge" as discussed earlier though.
More information about the bazaar