On Fri, 12 Nov 2010 15:02:55 +0100, Steve Ebersole <st...@hibernate.org> wrote:
> > On Friday, November 12, 2010, at 07:09 am, Hardy Ferentschik wrote: >> On Fri, 12 Nov 2010 13:27:17 +0100, Steve Ebersole <st...@hibernate.org> >> How does cherry picking solve the problem of the directory name changes? > > Well like I said before the code in git that does merging understands > the fact > that files are renamed. Your approach does not natively because it > produces a > diff file which simply has *a* path. Ok, I see. I will try the cherry picking next time. If it is too complicate I will go back to the script idea. --Hardy _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
