On 29-11-12 13:07, Peter Firmstone wrote:
On 29/11/2012 10:04 PM, Simon IJskes - QCG wrote:
How about the following, we develop on a branch. Then we merge or
patch. We release. We pull a new branch of trunk. We merge/patch stuff
that did not make it in the release from the previous dev branch into
the current dev branch. (we can skip rebranching if we want to keep
the old dev branch).
It looks like a lot more work, but i suspect river-core will only get
small changes, and the rest will end up in other subprojects.
Ok, sounds like a plan.
Shall i do a 'switch-and-stitch' with trunk and new dev-branch? Do you
have a revision number from just before the bugfix experiments in
RegistrarImpl? We could make that the new trunk. And the current trunk
the dev-branch. I can do it in such a way, the revision history is kept
clean.
--
QCG, Software voor het MKB, 071-5890970, http://www.qcg.nl
Quality Consultancy Group b.v., Leiderdorp, Kvk Den Haag: 28088397
