On Jul 23, 2007, at 10:19 AM, Martin Langhoff wrote:
On 7/23/07, Steffen Prohaska <prohaska@xxxxxx> wrote:
My question is how to deal with this shared branch on the git
side. Should a core developer rebuild a sane history from such
a shared/mixed/unsorted branch by cherry picking the commits
to one or more topic branches?
I think that's usually frowned upon. As the committer did his/her work
on a particular state of the tree, and tested it. So every commit at
least *should* be of a working state. Once you rewrite history as a
"normal" practice, that flies out of the window. And it's a big loss.
That's only somewhat true. First, there's never a guarantee that the
committer tested it, especially if they had to pull before committing
(less likely they tested the resulting merge than tested their
original code). Second, rewriting history isn't a big loss. It's
done all the time here on this list. The patches I've sent in rarely
appear applied on top of the commit I made them from. The mob branch
could just be viewed as a set of patches to use, and it becomes the
maintainer's job to test the results after cherry-picking from them.
~~ Brian
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
