"Leslie P. Polzer" <[email protected]> writes: > On Feb 24, 1:02 pm, Jan Rychter <[email protected]> wrote: > >> The merge is in a new branch: >> >> http://github.com/jwr/weblocks-jwr/tree/navigation-rewrite-merge-with... > > Can you give me some hints on how to best push this into an > existing hg repo (i.e. weblocks-dev)?
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 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. If you want me to send you the patch bundle, please let me know. The fact that you recently pulled in changes to navigation (7408fb1d7fe9) after my merge might make it more difficult for you. Things like these will obviously conflict. --J. --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
