Hi, On Thu, Jun 2, 2011 at 5:07 PM, Darren Dale <dsdal...@gmail.com> wrote: > On Thu, Jun 2, 2011 at 7:46 PM, Eric Firing <efir...@hawaii.edu> wrote: ... >> Even without the foulup, I think you would see that the merges from >> maintenance branches into subsequent branches and into master make it >> very hard to figure out what has actually been done on any given branch. > > I strongly disagree. The only reason you get cleaner history graphs > with cherry picking is because it doesn't graph the cherry picks! If > you want to know what has been merged, you have to inspect the commit > message in one branch and match it up with the commit message in > another branch. How does that make it easier to figure out what has > been done on any given branch?
I think Eric's point is that it kind of feels (and looks) wrong to merge maintenance into master, rather than backporting fixes from master with cherry-picks. Maybe 'feels wrong' might be translatable as 'harder to think about' and therefore 'more error prone'? I can see the argument for doing it though. It is a common workflow? See you, Matthew ------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Discover what all the cheering's about. Get your free trial download today. http://p.sf.net/sfu/quest-dev2dev2 _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
