Roderich Schupp <roderich.sch...@gmail.com> writes: > I'm going to commit this to trunk and nominate for backports to 1.7 and 1.8.
The trunk change doesn't merge cleanly to either 1.8 or 1.7 so you will need to prepare backports: make backport branches from 1.7.x and 1.8.x branches, merge the change, resolve the conflicts and then nominate the branches. The conflict has to be resolved at some point and doing it in advance means a) it's clear what change is being proposed and b) it can be merged automatically. -- Philip Martin | Subversion Committer WANdisco | Non-Stop Data
