Vincent Snijders wrote: > > I am interested to hear how long it takes/took to merge this weeks > changes. I think in the end automating a bit is worth the effort, unless > you can merge the current batch in less than 5 minutes.
:-) It was a rather large merge this week. It took me 12 minutes - but I haven't had my first cup of coffee yet. ;-) The longest part of the merge is simply copy and pasting the merge svn revision numbers into gitk so I can search for the git commit revision (SHA1). Then it's simply a right click and selecting "cherry-pick". I guess I could put a quick script together to automate the above. But normally the merges to fixes branch is small, so I don't mind the few minutes it takes (once a week). Where do you find what revisions must be merged into fixes branch? Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://opensoft.homeip.net/fpgui/ -- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
