>> Today's edition of the testing branch includes a few more topic branches,
> > including Brice's hash implementation and the first installment of > Jesse's > > REST work. > > Thanks for merging the hash patch. > Thanks for writing it. :) > > The cached-conflict-resolution workflow has been much nicer than the the > > rebasing-on-testing-midpoints mess. > > Did you already talk about the "cached-conflict-resolution"? > Some time ago. The basic idea is our script for building the testing branch saves the conflict resolutions (sort of like git-rerere but under as diffs in regular files and totally under our control) and then will re-use them the next time you build the branch so that you don't have to keep solving the same conflicts over and over. The alternative "simpler" solution of rebasing onto a testing midpoint (which you, Luke and I each did once) sounds reasonable (you don't need to keep track of the resolutions, they get baked into the branches) but gets real messy real fast in practice as the rebased branches now contain different commits representing the same set of changes from the other topic branches. The corresponding case with the cached conflict resolution is very simple: you may have to "re-do" resolutions analogous to an earlier resolution if the underlying code changes _in_the_conflicted_region_ but (unless you decide you intentionally want to redo a resolution) you never have to visit the same resolution twice. > While I"ll continue to support the > > three branches that have been rebased on old testing branches, any future > > branches for inclusion should be based on the current head of master at > the > > time of their inclusion. > > OK. If you need any rebasing from me, let me know. > I shouldn't, but thanks for the offer, and if I do I'll let you know. -- Markus -- 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.
