On 12/02/2009 10:11 AM, Hans de Goede wrote:
> Also starting from scratch (so merge your current work which
> includes bugfixes to not yet merged patches, in to one big patch, and
> then breaking that one up again), is the only way I can think of to
> get a sane set of patches to commit in to the master git repo, just
> pushing everything as is from your current repo to the master is not
> the way to handle this IMHO.
There are some things you can do with git to make reformatting the patches
easier, as well. Basically the steps are:
1) Use "git rebase -i HEAD^^^^" to merge all the changes into one patch
2) "git-format-patch HEAD^" to get a patch you can apply later
3) put the result of step two someplace safe
4) "git reset --hard origin/master"
5) patch -p1 < ../0001-whatever.patch
6) "git add -i", and select individual chunks to add
7) "git commit"
8) if there are changes left, go to step 6
In step six, you can add smallish chunks to the set you're checking in, rather
than adding the whole patch wholesale, so you can effectively re-order your
original checkins this way, including splitting up and merging various bits of
them.
--
Peter
Growth for the sake of growth is the ideology of the cancer cell.
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
