The ferret-ultrasphinx changes probably span too many commits to easily do a cherry-pick.
Michael did perform the ultrasphinx conversion on a branch based on Rails 2.0 and then merged it with edge which was at Rails 2.1. I don't believe there's a commit on the master branch that has ultrasphinx with Rails 2.0. However, that work branch's commit history is still available in the official repository. That's one of the nice things about how Git works (and branches are actually just pointers to commits so it's not actually necessary to have them named in order to access the code). Taking a look via gitk (not 100% sure what the equivalent tool for Windows is if you're not using cygwin), it looks like the last commit on the "sphinx" branch before it was permanently merged with edge was Fixed admin AllPerson template and search bugs bafb6df45ee1ad96fe33f9d20d1cd186042eaf48 Michael Hartl 2008-07-19 18:31:41 That's probably a good starting point for you. The diff you'll want to is against Put readme in rdoc format a886e7db53c67e7da3b270f6030c8d8ce22635fa Piotr Jakubowski 2008-07-01 00:31:01 which was the starting point. I don't believe there were a whole sphinx-specific commits after (that weren't documentation-related) that but you might want to take a look at the commit history in case I missed any on this quick look. Long On Thu, Nov 13, 2008 at 4:50 AM, murali <[EMAIL PROTECTED]> wrote: > > Another way of putting my question is 'can I cherry pick only the > search changes?" > > On Nov 12, 6:13 pm, Thomas <[EMAIL PROTECTED]> wrote: > > Hi > > > > I'm in the same situation. I know the best approach is using git > > efficiently, which I am not doing. I've got my project under Subversion. > > So I use WinMerge and it's going well. This approach lets you look > > carefuly at the code while you're doing your merges. > > > > If you're using git I'm sure people will come with suggestions. > > > > Cheers, > > > > Thomas > > > > murali a écrit : > > > > > > > > > > > > > Hi, > > > > > Our site is built on a Insoshi fork from the pre-rails2.1 days. I > > > would like to merge in the new changes like search, groups etc one by > > > one to mitigate the conflict issues. Our UI has deviated a lot from > > > Insoshi and hence the conflict concern. > > > > > What is the best approach to merge in only the search changes? And > > > then the group changes? > > > > > Thanks. > > > --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
