Code review comment for lp:~schnetter/pocl/pocl

Revision history for this message
Pekka Jääskeläinen (pekka-jaaskelainen) wrote :

Yes, check out 0.6 (e.g. 'bzr co lp:pocl/0.6 pocl-0.6') then do a cherry pick merge from your branch (bzr merge -c revno ../yourbranchlocation or bzr merge -rFIRSTREV..LASTREV ../yourbranchlocation or similar) then commit (if a bound branch, just bzr commit in the 0.6 tree). Though, cherry picking book keeping is not the best in Bazaar, and IIRC the '-c' that selects a single rev is the most robust in "backporting" revisions. I cannot recall the exact problems involved but I've bumped into them in the past.

IMO code base cleanups (cosmetic) are OK to commit to 0.6 as long as we do not introduce instability/regressions.

« Back to merge proposal