Jiri, depending on the status of your branch (how stable it is), you might want to just make it ready for merging with master. Ben will then have to merge his branch with master when its ready. Unless your branch isn't guaranteed to run smoothly...
Itamar. On 2/9/2010 3:55 PM, Šplíchal Jiří wrote: > Hi Ben, > > I merged your branch into mine. Now I cannot compile my > code because of changes in your branch - especially > the Term is no longer reference counted. > So I would like to ask - should I change my code in order > to match changes in your branch? (Then it would no longer > be possible to compile it with master...) > > Greetings, > Jiri > > > -----Original Message----- > From: Ben van Klinken [mailto:bvanklin...@gmail.com] > Sent: Thursday, September 02, 2010 11:53 AM > To: clucene-developers@lists.sourceforge.net > Subject: Re: [CLucene-dev] Span Queries have been ported > > great news! > > my branch (ben_working4) contains a lot more stuff than master. That > will become mastter soon unless a problem is found with it. I believe > we r waiting on some automated tests that someone was running. Either > way please try that branch out as well if you could > > cheers > ben > > On Wednesday, September 1, 2010, Veit Jahns<nuncupa...@googlemail.com> wrote: > >> 2010/8/31 Šplíchal Jiří<splic...@tovek.cz>: >> >>> I have just pushed SpanQuery implementation and its basic tests in to the >>> >>> jiri-working branch. >>> >>> >>> >>> It would great if you could test it so that it can be merged into the >>> current HEAD. >>> >> Great! The tested it on with Win7/VS2010 and the span query tests >> succeeded. But I will test it on other plattforms as well. >> >> >>> PS: Which branch should I merge into my working branch in order to use your >>> latest >>> >>> changes? >>> >> I guess, the master branch. That's the branch I use for merging the >> latest changes into my working branch. >> >> Veit >> >> ------------------------------------------------------------------------------ >> This SF.net Dev2Dev email is sponsored by: >> >> Show off your parallel programming skills. >> Enter the Intel(R) Threading Challenge 2010. >> http://p.sf.net/sfu/intel-thread-sfd >> _______________________________________________ >> CLucene-developers mailing list >> CLucene-developers@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/clucene-developers >> >> > ------------------------------------------------------------------------------ > This SF.net Dev2Dev email is sponsored by: > > Show off your parallel programming skills. > Enter the Intel(R) Threading Challenge 2010. > http://p.sf.net/sfu/intel-thread-sfd > _______________________________________________ > CLucene-developers mailing list > CLucene-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/clucene-developers > > ------------------------------------------------------------------------------ > This SF.net Dev2Dev email is sponsored by: > > Show off your parallel programming skills. > Enter the Intel(R) Threading Challenge 2010. > http://p.sf.net/sfu/intel-thread-sfd > _______________________________________________ > CLucene-developers mailing list > CLucene-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/clucene-developers > > > ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ CLucene-developers mailing list CLucene-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/clucene-developers
