On Jun 5, 2012, at 5:51 PM, John Verhaeg wrote: > > On Jun 5, 2012, at 10:27 AM, Steve Ebersole wrote: > >> Out of curiosity, why 2 merges? > > I was just thinking it might help reduce the number of potential conflicts > during the first merge. If not, then one is fine in my mind.
Same here. Since you mentioned that the test directories have already partly diverged I thought it would be easier to do things step by step. Personally I think this is the more natural approach anyways. If we sort out a merge now the collapsing of the test directories should be straight forward then. I guess one could run some quick experiments to see how bad things are. Personally I would start my attempts w/ a merge first :-) --Hardy _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
