Hi Michael, On Saturday, 2011-09-10 20:19:54 +0200, Michael Stahl 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
>
> i don't completely understand your problem, but here's how i have done it:
Maybe due to my incorrect assumptions, I should had tried first what
I was writing.. see my other mails I replied to the one you quoted.
> > for CWS in $(hg bookmarks | awk '{print $1}'); do hg export -o
> > "/tmp/hg-cws/${CWS}_%n_%h.patch" $(hg out -q --no-merges --template " -r
> > {node}" -r ${CWS} /home/ooo/OOO340); done
>
> running this against a HG repo containing all CWSes bookmarked and a HG
> repo containing only OOO340 results in >1900 patches totalling about 1G.
I didn't create such a bookmark repo, I'm creating the exports from the
raw CWS repos, at least for the 3.4 ones. The remaining 1800 DEV300 CWS
patches definitely will need a different approach, your's looks
sensible.
> of course the merges cannot be converted so you'll have to re-do the
> merge conflict resolution while applying the patches :(
That'll be a PITA for DEV300..
> and i completely forgot to mention that i've got a linear MQ patch
> series applying against OOO340 that contains the following:
>
> ooo340fixes
> mingwport35
>
> ause131
> ause130
> writerfilter10
> gnumake4
> sd2gbuild
Nice, will you apply and commit them?
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
