Rebase, parent and push

[Jelmer Vernooij]

On Thu, 2008-10-30 at 11:49 +0000, Russel Winder wrote:
> On Thu, 2008-10-30 at 11:32 +0100, Jelmer Vernooij wrote:
> > I wonder why you would rebase at all in the case you're pushing to
> > launchpad? 
> > 
> > The main use case for rebase (especially when used together with
> > bzr-svn) is as use before push, to avoid the need to merge the push
> > branch.
> 
> I am using rebase (and not pull or merge) to ensure that at all times my
> Bazaar branches have all the changes I have locally sitting on top of
> all the changes in Subversion repository -- i.e. all changes made in the
> Subversion repository are slipped in under my changes.  This does two
> things, it means I always find any incompatibilities between trunk and
> my "patches", and I always have a putative commit to Subversion.
> 
> If there are better ways to do this then I would love to know, but this
> is the "workflow" that seems most sensible and with least tracking
> problems to me just now.
Hmm, that does make sense and it seems some other people also seem to
use rebase as an alternative to merge+commit. 

I'll consider changing the default from :push, :parent
to :pull, :parent.

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081030/110e89f9/attachment.pgp