I'm trying a (local) reintegrate merge first. In theory that should preserve trunk's changes...
-Matt --- On Fri, 3/13/09, James Carman <ja...@carmanconsulting.com> wrote: > From: James Carman <ja...@carmanconsulting.com> > Subject: Re: [collections] jdk5 branch > To: "Commons Developers List" <dev@commons.apache.org> > Date: Friday, March 13, 2009, 3:57 PM > As long as you've got any changes > from trunk that you need in your > branch, I'd say just copy the stuff around (copy trunk to a > branch and > copy your branch over to trunk). > > On Fri, Mar 13, 2009 at 4:53 PM, Matt Benson <gudnabr...@yahoo.com> > wrote: > > > > Honestly, I don't rightly know. I suppose I could > try a merge locally and see how painful it is. Otherwise I > suppose the alternative is to make sure all trunk-to-branch > catch-up merges are done atomically and extremely > informatively, then replace? > > > > -Matt > > > > --- On Fri, 3/13/09, James Carman <ja...@carmanconsulting.com> > wrote: > > > >> From: James Carman <ja...@carmanconsulting.com> > >> Subject: Re: [collections] jdk5 branch > >> To: "Commons Developers List" <dev@commons.apache.org> > >> Date: Friday, March 13, 2009, 3:45 PM > >> Are you going to merge or just > >> replace? > >> > >> On Fri, Mar 13, 2009 at 4:41 PM, Matt Benson > <gudnabr...@yahoo.com> > >> wrote: > >> > > >> > I think this guy is getting ready to be > merged back to > >> trunk after I make sure any trunk changes are > merged over. > >> It'd be great if anybody wanted to have a look > at it in > >> case I'm on crack. > >> > > >> > -Matt > >> > > >> > > >> > > >> > > >> > > >> > --------------------------------------------------------------------- > >> > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > >> > For additional commands, e-mail: dev-h...@commons.apache.org > >> > > >> > > >> > >> > --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > >> For additional commands, e-mail: dev-h...@commons.apache.org > >> > >> > > > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > > For additional commands, e-mail: dev-h...@commons.apache.org > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
