Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-27 Thread Pedro F. Giffuni
Hi; I thought it would be a good time to bring this subject up again. --- On Sat, 9/10/11, Mathias Bauer wrote: ... and i completely forgot to mention that i've got a linear MQ patch series applying against OOO340 that contains the following: ... ause131 ause130 writerfilter10

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-18 Thread Mathias Bauer
Am 18.09.2011 01:04, schrieb Michael Stahl: - mba34issues01: somebody said that he would do this one; Mathias, how long do we have to wait... :) Done. Regards, Mathias

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-17 Thread Michael Stahl
On 10.09.2011 20:31, Eike Rathke wrote: On Saturday, 2011-09-10 20:19:54 +0200, Michael Stahl wrote: 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

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-17 Thread Raphael Bircher
Am 18.09.11 01:04, schrieb Michael Stahl: On 10.09.2011 20:31, Eike Rathke wrote: On Saturday, 2011-09-10 20:19:54 +0200, Michael Stahl wrote: and i completely forgot to mention that i've got a linear MQ patch series applying against OOO340 that contains the following: ooo340fixes mingwport35

Re: [code][repo] Integration of CWSs, calc67

2011-09-11 Thread Mathias Bauer
Moin Eike, Am 09.09.2011 16:11, schrieb Eike Rathke: Hi, calc67 DEV300m106 Doing that. Eike Before you waste your time with it: I will take care for mba34issues01. Regards, Mathias

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-10 Thread Eike Rathke
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

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-10 Thread Eike Rathke
Hi, On Saturday, 2011-09-10 17:46:10 +0200, Eike Rathke wrote: 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, Bah, forget what I wrote in that mail, the problem is worse, that changeset

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-10 Thread Eike Rathke
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

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-10 Thread Eike Rathke
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

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-10 Thread Mathias Bauer
Am 10.09.2011 21:00, schrieb Pedro F. Giffuni: Hi, Excuse the newcomer ignorance ... --- On Sat, 9/10/11, Michael Stahl wrote: ... and i completely forgot to mention that i've got a linear MQ patch series applying against OOO340 that contains the following: ooo340fixes

Re: [code][repo] Integration of CWSs, jl167, impress212

2011-09-10 Thread Eike Rathke
Hi, On Saturday, 2011-09-10 21:00:40 +0200, Eike Rathke wrote: Master DEV300, Release 3.4, Status nominated: jl167 DEV300m104 I don't know what happened on that CWS, apparently nothing. Whyever it was nominated.. Eike -- PGP/OpenPGP/GnuPG encrypted mail preferred in all private

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-10 Thread Eike Rathke
Hi Mathias, On Saturday, 2011-09-10 21:57:05 +0200, Mathias Bauer wrote: 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

Re: [code][repo] Integration of CWSs, jl167, impress212

2011-09-10 Thread Eike Rathke
Hi, On Saturday, 2011-09-10 21:00:40 +0200, Eike Rathke wrote: Master DEV300, Release 3.4, Status nominated: impress212 DEV300m104 I stumbled over a few things in that CWS that needed extra care: It touched files under svtools/source/filter.vcl/filter/ That directory was renamed to

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-09 Thread Eike Rathke
Hi, On Wednesday, 2011-09-07 15:43:13 +0200, Eike Rathke wrote: I'll first grab calc68 and try my luck ;) Did so with a git svn repository, see another thread Message-ID: j3frmh$6of$1...@dough.gmane.org

Re: [code][repo] Integration of CWSs, HOW-TO with hg and git svn and stgit

2011-09-09 Thread Eike Rathke
Hi, On Friday, 2011-09-09 15:40:06 +0200, Eike Rathke wrote: Did so with a git svn repository, see another thread Message-ID: j3frmh$6of$1...@dough.gmane.org http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/201108.mbox/%3Cj3frmh$6of$1...@dough.gmane.org%3E Note that for the stg

Re: [code][repo] Integration of CWSs

2011-09-07 Thread Eike Rathke
Hi Mathias, On Wednesday, 2011-09-07 00:28:29 +0200, Mathias Bauer wrote: | So, we can choose: | | x) first identify and remove license incompatible code to be pointed to |clashes when the CWSs will be integrated, additionally lookout for |new license incompatible code when

Re: [code][repo] Integration of CWSs

2011-09-07 Thread Marcus (OOo)
Am 09/07/2011 03:43 PM, schrieb Eike Rathke: On Wednesday, 2011-09-07 00:28:29 +0200, Mathias Bauer wrote: | So, we can choose: | | x) first identify and remove license incompatible code to be pointed to |clashes when the CWSs will be integrated, additionally lookout for |new license

Re: [code][repo] Integration of CWSs

2011-09-07 Thread Mathias Bauer
Am 07.09.2011 18:47, schrieb Marcus (OOo): Am 09/07/2011 03:43 PM, schrieb Eike Rathke: On Wednesday, 2011-09-07 00:28:29 +0200, Mathias Bauer wrote: | So, we can choose: | | x) first identify and remove license incompatible code to be pointed to |clashes when the CWSs will be

[code][repo] Integration of CWSs

2011-09-06 Thread Eike Rathke
Hi, And now for something completely different: CODE As lined out in Message-ID: 20110831191817.gf29...@kulungile.erack.de http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/201108.mbox/%3c20110831191817.gf29...@kulungile.erack.de%3E there are 2 possible approaches to integrate pending

Re: [code][repo] Integration of CWSs

2011-09-06 Thread Pedro F. Giffuni
: Eike Rathke o...@erack.de Subject: [code][repo] Integration of CWSs To: ooo-dev@incubator.apache.org Date: Tuesday, September 6, 2011, 11:50 AM Hi, And now for something completely different: CODE As lined out in Message-ID: 20110831191817.gf29...@kulungile.erack.de http://mail

Re: [code][repo] Integration of CWSs

2011-09-06 Thread Rob Weir
: [code][repo] Integration of CWSs To: ooo-dev@incubator.apache.org Date: Tuesday, September 6, 2011, 11:50 AM Hi, And now for something completely different: CODE As lined out in Message-ID: 20110831191817.gf29...@kulungile.erack.de http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev

Re: [code][repo] Integration of CWSs

2011-09-06 Thread Mathias Bauer
Hi Eike, Am 06.09.2011 18:50, schrieb Eike Rathke: | So, we can choose: | | x) first identify and remove license incompatible code to be pointed to |clashes when the CWSs will be integrated, additionally lookout for |new license incompatible code when integrating CWSs thereafter,