"Leslie P. Polzer" <[email protected]> writes: >> 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?
I don't think so. Here's the topology: master corresponds to weblocks-dev as of cd83809dfadc navigation-rewrite is my navigation-rewrite work, also including a large part of modern-dispatching navigation-rewrite-merge-with-dev-cd83809dfadc was created by forking it off master and merging in navigation-rewrite (resolving all problems) So, navigation-rewrite-merge-with-dev-cd83809dfadc contains what you want: weblocks-dev with the complete merge. Now, issuing "git format-patch master" in that branch causes git to export all patches relative to the master branch, which is also what you want. >> 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... I think this is how git works -- for git it is perfectly acceptable to have two patches in different branches modifying the same thing. A merge then happens, during which git figures out what the final result is. This is what happened here -- for example, my presentation-dom-id work went into weblocks-dev. Git doesn't mind, as long as the final result is the same. However, if you ask it for patch history, it will faithfully answer with all the changesets it has. I don't know how hg treats mergers, perhaps this isn't a problem. I also don't know of other ways to help -- I mean, I can provide one huge diff, but that's probably not what you want. --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 -~----------~----~----~----~------~----~------~--~---
