hi philippe
I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load? Is it for 1.2? Stef _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
I could have a look, if you tell me where I can find it...
On 27 Aug 2010, at 10:22, stephane ducasse wrote: > hi philippe > > I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load? > Is it for 1.2? > > Stef > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
this is in the inbox
Stef On Aug 27, 2010, at 10:47 AM, Sven Van Caekenberghe wrote: > I could have a look, if you tell me where I can find it... > > On 27 Aug 2010, at 10:22, stephane ducasse wrote: > >> hi philippe >> >> I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load? >> Is it for 1.2? >> >> Stef >> >> _______________________________________________ >> Pharo-project mailing list >> [hidden email] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
There is a merge in PharoInbox:
Name: WebClient-Core-SvenVanCaekenberghe.74 Author: SvenVanCaekenberghe Time: 27 August 2010, 1:59:46 pm UUID: d97ff218-9bde-4259-bf8a-f9d0fe116138 Ancestors: WebClient-Core-StephaneDucasse.73, WebClient-Core-pmm.73 merged in pharo-core 1.2 In Pharo1.2a #12115 there are only 2 units tests failing (against WebClient-Tests-ar.30). Sven On 27 Aug 2010, at 11:02, Stéphane Ducasse wrote: > this is in the inbox > > Stef > > On Aug 27, 2010, at 10:47 AM, Sven Van Caekenberghe wrote: > >> I could have a look, if you tell me where I can find it... >> >> On 27 Aug 2010, at 10:22, stephane ducasse wrote: >> >>> hi philippe >>> >>> I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load? >>> Is it for 1.2? >>> >>> Stef >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> [hidden email] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> >> _______________________________________________ >> Pharo-project mailing list >> [hidden email] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
In reply to this post by stephane ducasse
On 08/27/2010 10:22 AM, stephane ducasse wrote:
> hi philippe > > I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load? > Is it for 1.2? No, it's not. Do you have WebClient already in 1.2 and are trying to merge against it? If so I can have a look at it. Cheers Philippe _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
On Aug 27, 2010, at 3:45 PM, Philippe Marschall wrote: > On 08/27/2010 10:22 AM, stephane ducasse wrote: >> hi philippe >> >> I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load? >> Is it for 1.2? > > No, it's not. Do you have WebClient already in 1.2 and are trying to > merge against it? If so I can have a look at it. yes we have it in 1.2 and sven merged your changes but it would be great if you can have a look > > Cheers > Philippe > > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
Free forum by Nabble | Edit this page |