Rebase, parent and push

[Russel Winder]

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.
 
-- 
Russel.
====================================================
Dr Russel Winder                 Partner

Concertant LLP                   t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,              f: +44 8700 516 084
London SW11 1EN, UK.             m: +44 7770 465 077
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081030/032515b3/attachment.pgp