incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Stahl <...@openoffice.org>
Subject Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit
Date Sat, 10 Sep 2011 18:19:54 GMT
On 10.09.2011 17:46, Eike Rathke wrote:
> 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

i don't completely understand your problem, but here's how i have done it:

> 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.

of course the merges cannot be converted so you'll have to re-do the
merge conflict resolution while applying the patches :(

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

(second group is for 3.5 so can't be committed to SVN now...)

regards,
 michael


Mime
View raw message