bzr pump should support also rebase not only merge

Bug #450828 reported by Gioele Barabucci
20
This bug affects 4 people
Affects Status Importance Assigned to Milestone
bzr-pipeline
Triaged
Low
Unassigned

Bug Description

bzr-pipeline should also support rebase operations in bzr pump, not only merge operations.

Right now bzr pump does a series of merge operations down the pipeline of branches. This is OK with workflows based on merge but unneeded for workflows based on rebase.

I simulated an hypothetical "bzr pump --rebase" with a series of "bzr switch-pipe :next; bzr rebase :prev" and everything seems to be working fine.

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 450828] [NEW] bzr pump should support also rebase not only merge

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gioele Barabucci wrote:
> Right now bzr pump does a series of merge operations down the pipeline
> of branches. This is OK with workflows based on merge but unneeded for
> workflows based on rebase.

I don't think workflows based on rebase are a good idea, because they
discard history, so I won't add support for it.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkrVzmoACgkQ0F+nu1YWqI1stQCfWPm8uRys0Ngs6cQzY1o9NbDN
VfwAniTchnELlyet6AVrACvJcz4Hqb93
=Uqom
-----END PGP SIGNATURE-----

Revision history for this message
Gioele Barabucci (gioele) wrote :

Would an eventual patch that adds support for rebase to pump be rejected?

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 450828] Re: bzr pump should support also rebase not only merge

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gioele Barabucci wrote:
> Would an eventual patch that adds support for rebase to pump be
> rejected?

Possibly. The argument against accepting it would be that I don't want
to think that rebase is encouraged and supported.

I don't understand why you would want to use rebase and pipes together.
 Rebase is usually used to treat individual commits as pipes. In a
sense, pipelines and loom are an alternative to rebase.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkrV2TYACgkQ0F+nu1YWqI0jewCffexLrb8Uks6uzBn2auVgYI/5
A7QAnjNEqKXxvSzpYAsrCricpydfyDbe
=LCU9
-----END PGP SIGNATURE-----

Revision history for this message
Gioele Barabucci (gioele) wrote :

I just started to use pipes and I have yet to find a workflow that I am comfortable with. It seems to me that rebase + pump --rebase is exactly what I am looking for.

What I do is branching a work branch from a mainline branch. The work branch is then converted to a pipeline and I add pipes to it. Every now and then I rebase the work branch (now the :first pipe) with the changes that happened in mainline. In this way work's and other pipes' history is not polluted with these periodical merge operations. Once work is rebased I need a way to propagate the changes to the other pipes: this is why I need a pump --rebase operation.

Aaron Bentley (abentley)
Changed in bzr-pipeline:
importance: Undecided → Low
status: New → Triaged
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.