On Thursday 29 October 2009, Øyvind Harboe wrote: > If rebase can't merge reordering of code automatically,
It won't. But on the other hand, pure reordering won't generally create particularly painful merge issues. (It's merge tool confusion which does that.) When I do such things by hand, it's sometimes useful to just split patches into patchlets ... if ABC is reordered to BCA, then a patchlet touching "A" can apply to BCA (with offsets) and a patchlet touching "BC" can apply to BCA too (offsets), either before or after the other patchlet. > then I > would generally like such pervasive refactoring of code to take place > at an announced time... Makes branches easier to maintain... Yeah, my bad. Apologies. Won't happen again. - Dave _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
