Changeset identity

Russel Winder russel.winder at concertant.com
Wed Jul 30 07:27:32 BST 2008


I know I should know the answer to this but...

Context:  I have a development mainline branch and a maintenance branch
-- for certainty lets call the former Trunk and the latter 1.4.x -- for
the truly nosey, the project name is Gant :-).  The branches are in a
shared repository, but this is implementation detail.  Development
changes occur only in Trunk and have no effect on 1.4.x -- except that
some of the changes turn out to be bug fixes that should appear in a bug
fix release and so need applying to 1.4.x.  Conversely almost all
changes made in 1.4.x, being bug fixes, need applying also in Trunk.

So the question is, what is the officially approved way of naming a
changeset so that it may be applied from one branch to another.  Is push
an acceptable technique here or is merge and commit mandated?  The issue
then is that the changeset already has a commit message and no new
commit message is needed so any sequence that requires an explicit
commit seems sub-optimal, indeed unnecessary.

Thanks.
 
-- 
Russel.
====================================================
Dr Russel Winder                 Partner

Concertant LLP                   t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,              f: +44 8700 516 084
London SW11 1EN, UK.             m: +44 7770 465 077
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080730/69617d40/attachment.pgp 


More information about the bazaar mailing list