On 04/11/09 20:57, Markus Roberts wrote: > Note: I pushed 2 branches, one for 0.25.x and one for master because it >> touches code that diverged between 0.25.x and master, but the fix is the >> same (except master has some tests) >> > > So call me an old fuddy, but a lot of these sorts of problems don't happen > when you just apply patches rather than merging branches.
I suspect you'd get exactly the same issues with patches in the case I'm referring to. I fail to see how the same patch could apply to two diverged codebases. Sure you'll get a conflict, exactly what the merge will produce (indeed merging is not more than applying patches, or am I wrong?). I practiced too much quilt and other manual patch stacks for my mental health, I'm happy with VCS and especially git :-) -- Brice Figureau My Blog: http://www.masterzen.fr/ --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
