Joshua, this was discussed prior to doing the merge. Sorry if you missed it. I pulled everything over to HEAD that was current on the v22branch at that time. I then tagged the v22branch. You should simply be able to do a merge with your stuff against that new v22branch tag, and then apply that to the Hibernate3 HEAD.
> -----Original Message----- > From: [EMAIL PROTECTED] > [mailto:[EMAIL PROTECTED] Behalf Of Joshua > Davis > Sent: Wednesday, June 23, 2004 7:07 PM > To: hibernate-devel > Subject: Re: [Hibernate] v22branch - Unit test failures and errors > > > <grumble> > Okay... when did v22branch die? > I guess I have to merge all my crap back into HEAD? > > --- Simon Spero <[EMAIL PROTECTED]> wrote: > > Max Rydahl Andersen wrote: > > > > > v22branch is dead - long live HEAD! > > > > > ------------------------------------------------------- > This SF.Net email sponsored by Black Hat Briefings & Training. > Attend Black Hat Briefings & Training, Las Vegas July 24-29 - > digital self defense, top technical experts, no vendor pitches, > unmatched networking opportunities. Visit www.blackhat.com > _______________________________________________ > hibernate-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/hibernate-devel ------------------------------------------------------- This SF.Net email sponsored by Black Hat Briefings & Training. Attend Black Hat Briefings & Training, Las Vegas July 24-29 - digital self defense, top technical experts, no vendor pitches, unmatched networking opportunities. Visit www.blackhat.com _______________________________________________ hibernate-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/hibernate-devel