Workflows, rebase, patch theory

[Aaron Bentley]

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

Stefan Monnier wrote:
>> 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".

I don't think the comparison is apt.  tla update was a
history-preserving operation.  As part of applying the patches from the
other branch, it added metadata to {arch} indicating which revisions had
been applied.  It also didn't commit any of these changes.

Now, you *could* approximate rebase by running
tla replay X
tla commit -m "replayed X"

But that doesn't create a doppelgänger commit-- it creates one that is
clearly a new commit based on changes from X, with a different commit
message, commit time, commit author, etc.  In fact, each commit is a
cherry-pick with history preserved, an operation Bazaar would very much
like to support.

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

iD8DBQFIKa8L0F+nu1YWqI0RAjcUAJ0dxyo8355BmytEE3EF3OzoE4czHACfWmVv
GHgXtpYtZG5KEZhBNtBwyyY=
=/HG/
-----END PGP SIGNATURE-----