On 2010/12/18 01:26, Paul Sokolovsky <pmis...@gmail.com> wrote:
> Or, it would be possible to produce list of all commits on branch,
> manually filter out merge commits from it, and then pass to some 
> "mass cherry-pick" tool. Of course, there will be conflicts, so that
> tool must behave like rebase - stop on cnflict, allow to inspect, fix,
> or skip it, and then continue with the sequence. Well, does such mass
> c-p tool exist? It must be ;-)

As always with git, there are several ways of doing that.  Here's how
I would do it:

First, "git filter-branch" may be used to get only a sub tree (such as
src/gcc-4.4.0).  That will leave only commits touching gcc.

Then use "stg uncommit" to convert all commits after the pristine
import to stgit patches.

Import the newest upstream gcc into a new branch.

Use "stg rebase" to replace cegcc's initial gcc import with the new
upstream version, and stgit will push all the patches on top of the
new upstream version (with lots and lots of conflicts, of course).

In the end (after a few days of hard work), you'll have a branch full
of patches, and these need to be sorted, folded, submitted.

------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Cegcc-devel mailing list
Cegcc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cegcc-devel

Reply via email to