Hi, On Sun, 26 Jul 2009, Carl Sorensen wrote:
> On 7/26/09 11:35 AM, "Johannes Schindelin" <[email protected]> > wrote: > > > On Sat, 25 Jul 2009, Carl Sorensen wrote: > > > >> As you're aware, I've been working on a patch for autobeaming. > >> > >> It affects c++, scheme, and documentation files. > >> > >> Now I want to apply the patch to master. But the problem is that all of > >> the documentation files have moved to Documentation/ISOLANG/notation > >> instead of Documentation/ISOLANG/user > >> > >> So this seems to break any means of making my patch apply. > >> > >> Any git gurus out there who have an idea of how I can do this without > >> having to manually apply patches made between the files in the different > >> directories? > > > > You should be ablt to use "git cherry-pick <commit>" on the branch you > > want to port this commit to. This will perform a rename-aware 3-way > > merge. > > I tried that, but I don't know how to make it work properly. > > sorensen2:lilypond-working Carl$ git cherry-pick new-beam-settings > warning: too many files (created: 526 deleted: 717), skipping inexact rename > detection This means that the rename detection did not kick in. I think the easiest would be to "git reset --hard" (to reset to the previous state), then configure a higher limit with "git config merge.renamelimit 1500" and try the cherry-pick again. Ciao, Dscho _______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
