[hibernate-dev] Back-porting to 3.6
steve at hibernate.org
Fri Nov 12 09:49:21 EST 2010
Given your setup (separate clones) I am not sure merge, rebase or cherry-pick
are going to work. Another idea I have been toying with is to link the 2
clones (remote can be a file path). Really kind of orthogonal to the original
discussion, but has bearing.
On Friday, November 12, 2010, at 08:30 am, Hardy Ferentschik wrote:
> On Fri, 12 Nov 2010 15:02:55 +0100, Steve Ebersole <steve at hibernate.org>
> > On Friday, November 12, 2010, at 07:09 am, Hardy Ferentschik wrote:
> >> On Fri, 12 Nov 2010 13:27:17 +0100, Steve Ebersole <steve at 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.
> hibernate-dev mailing list
> hibernate-dev at lists.jboss.org
Steve Ebersole <steve at hibernate.org>
More information about the hibernate-dev