> I did the merge with latest weblocks-dev (at the time, which means > cd83809dfadc) -- what I'd do if I were you is first, check out my > 'master' branch (which tracks weblocks-dev), and the > navigation-rewrite-merge-with-dev-cd83809dfadc branch. Then do a > > git checkout navigation-rewrite-merge-with-dev-cd83809dfadc > git format-patch master
All the merging work you did in master will be lost this way, won't it? > The result is 62 patches that are the difference between > weblocks-dev-cd83809dfadc and navigation-rewrite-merge. These include > modern-navigation work and my work. They can probably be imported into > hg with a script, I guess, as they preserve author information. I must ask you to provide an appropriate changeset; these 62 patches include stuff already applied to the main repo... Leslie --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "weblocks" 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/weblocks?hl=en -~----------~----~----~----~------~----~------~--~---
