On Feb 3, 2010, at 4:48 PM, Markus Roberts wrote:
Markus - can you please merge in 0.25.x to master (to 0.25.4 tag) so
we can start to rebase the branches appropriately.
Short answer: not now.
Long answer: I'm trying to work out a viable strategy for using the
testing branch idea, and incorporate the already significant body of
work (just Luke's and my branches at the moment) into this process in
a way that makes sense. I'm rebuilding the testing branch ~100 times
a day at this point and collecting various results of diferent ways of
doing things. Dragging the 0.25.x stuff in wouldn't serve any
immediate goal so far as I can see and would significantly complicate
what I'm trying to do.
Well, there are some commits that we're basically ready to merge but
will likely be affected by 0.25.4 code, and there are, I think, tests
that were fixed in 0.25.x but are still broken in master.
We *know* we're going to merge everything in, so a delay doesn't make
a lot of sense without a specific reason.
-- Markus
P.S. On a related subject: I'm close to advocating a total ban on
merge commits as opposed to rebasing / cherry-picking. Merge commits
in git are. IMHO, seriously broken (a significant fraction of the
tools "ignore" them and many of the ones that don't simply act up when
they encounter one).
Can anyone give a cogent reason why they are a good thing, or show me
the error of my ways?
In general, code shouldn't need them - it should be rebased by the
user to the point where a simple fast-forward should work - but I'm
mixed on whether I like them or not. It can be clarifying to see the
merge commits in the history, but as you say, lots of other stuff just
doesn't work with them.
--
The truth is that there is nothing noble in being superior to somebody
else. The only real nobility is in being superior to your former self.
-- Whitney Young
---------------------------------------------------------------------
Luke Kanies -|- http://reductivelabs.com -|- +1(615)594-8199
--
You received this message because you are subscribed to the Google Groups "Puppet
Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
