Hi, On Friday, 2011-09-09 15:40:06 +0200, Eike Rathke wrote:
> 2. Lookup 12fa3ee3d107 in calc68 with > $ hg log | less > * Verify that no OOO340 masterfix is above that revision, if there > are lookup the topmost masterfix. > * Next changeset on top in calc68 is af32685ae575 There is one problem with this approach if the CWS was rebased to a milestone and already had changes, they are lumped together in one merge changeset, recognizable by having two parents, for example in ooo34gsl01 changeset: 276741:07f5f601d882 parent: 276673:07982b9dd204 parent: 276740:5851574127d1 summary: rebase to DEV300_m106 Applying that as one patch following the algorithm I lined out would lose all individual commit comments, so the best is to search in the CWS' log for cwsname: entries (in this case ooo34gsl01:) below the merge, and add those commit comments to the merge patch's commit comment. Hopefully the original author was trained enough to follow our convention ;-) Eike -- PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication. Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD
signature.asc
Description: Digital signature
