Will re-basing support be added into Bazaar core ?

[David Timothy Strauss]

----- "David Cournapeau" <david at ar.media.kyoto-u.ac.jp> wrote:

> That's the disagreement, I guess :) I think rebase is simpler and
> better than looms for many cases (that's one case where git model is
> actually simpler than bzr or mercurial IMHO). Rebase drawbacks and pitfalls
> are shared by looms (public sharing, "testability"). Internally, tt is
> essentially a reordering of your commits for both rebase and looms
> AFAICS, so this is expected.

Bazaar's Looms, unlike StGit and Mercurial Queues, fixes most of these issues. StGit allows public sharing at the loss of patch vs. commit semantics. Queues recognize patch semantics, but they're not publicly sharable. Looms have the best of both worlds: public sharability and recognition that patches aren't simply commits that get rewritten when the patch is improved or the upstream code changes. I think it's flawed to not have revision history for work done on a patch.

I'm not sure what you mean by "testability" with these tools. In Looms, the final applied patch (like each patch) is simply a branch.

> I prefer a core set of commands which I can use for different
> workflows - bzr "philosophy" seems different here, with a plugin (loom) to
> support the workflow that you can build by yourself with git + rebase. That's
> fine - both approaches have their merit; I just wanted to justify the
> rebase-based workflow in a git context.

Looms is really more equivalent to StGit, which is also non-core. Neither does anything magic; they simply automate what would be tedious to do with branches (in Bazaar's case) or commits (in git's case).

I don't use Loom because I find a few features unstable. Instead, I stack patches using regular branches that each branch from the one below. It's a touch tedious, but it gives me everything I want.

-- 
David Strauss
   | david at fourkitchens.com
   | +1 512 577 5827 [mobile]
Four Kitchens
   | http://fourkitchens.com
   | +1 512 454 6659 [office]
   | +1 512 870 8453 [direct]