Hi, On Saturday, 2011-09-10 17:46:10 +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, ok, new try.. > changeset: 276741:07f5f601d882 > parent: 276673:07982b9dd204 > parent: 276740:5851574127d1 > summary: rebase to DEV300_m106 One of the parents is the milestone rebased to, usually the second (verify that), in this case it is changeset: 276740:5851574127d1 user: Ivo Hinkelmann <i...@openoffice.org> date: Tue Apr 05 13:29:57 2011 +0200 summary: masterfix DEV300: #i10000# SRC_ROOT -> SOLARSRC a masterfix on top of DEV300_m106 The other is the CWS, usually the first, we want to follow. So in this example lookup the next occurence of 07982b9dd204, there the changesets of the CWS continue. If below them is another merge set that belongs to the CWS and not a master milestone, repeat procedure. To create the diffs explicitly state the start and end sets for those changes in between, in the example of ooo34gsl01 the export is hg export --git -o %b-1-%N-%n c6da340e613c hg export --git -o %b-2-%N-%n 859f1dffdb89:07982b9dd204 hg export --git -o %b-3-%N-%n 98a8c4a45d03: where the first is one set after which a merge followed, the second a series of sets up to another merge, and the last a series following that merge until HEAD. Be sure to specify the right order, and all serieses in the right order as well, hence the -1- -2- -3- in the names to have them alphabetically sorted in ls and completion and such. 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
