Workflows, rebase, patch theory
Stefan Monnier
monnier at iro.umontreal.ca
Wed May 7 16:41:46 BST 2008
> For someone who was introduced to DVCS via GNU Arch -> baz -> bzr, and
> who hasn't used git, all this talk of "rebase" is foreign. (It also
Arch has a limited form of rebasing: "tla update".
It doesn't apply to a branch (i.e. a set of consecutive patches), but to
a single patch (the patch corresponding to the local uncommitted
changes), so it's a degenerate form of rebasing.
"tla update" basically did:
- save local changes as a patch in some temp-file.
- fetch&apply changes from the specified branch.
- apply the previous saved patch.
Rebasing does the same but with a set of patches:
- revert the set of patches.
- fetch&apply changes from the specified branch.
- re-apply the set of patches.
Stefan
More information about the bazaar
mailing list