Im afraid there is not much sense in that interactive rebasing for
such big change - it took me so many hours to split patches and in
result now there are even more patches some new patches patched by old
patches ;] This is far from perfect.

I think we should simply use the default rebase patches to synchronize
the repositories, then work on common code and simply send better
patches since then... Those patches are the full history of what and
how I have done things, not always good as they evolved, but they are
good at the end ;-) I can see git wants to keep the commit history at
all cost, so the cructial thing here is producting good commits.

Another approach I can see is to simply copy resulting code of
openocd-swd and try to produce patches for each file/functionality
that is different for openocd-master. Then we avoid long history of
unnecessary changes and get only what we need for current
openocd-master. So the question is - how to produce "good patches"
from git diff (i.e. something as git format-patch)... or the git diff
is enough?

I will try the second approach and let you know. If it fails I will
simply send patches from rebase of my fork and openocd-master.

Regards :-)
Tomek

-- 
CeDeROM, SQ7MHZ, http://www.tomek.cedro.info
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to