Xiaofan Chen wrote: > I'd like to try out the FTDI mpsse patches by Andreas Fritiofson. > > I can see that there are 7 patches. What should I do to apply > these 7 patches on top of the latest git?
Try this: git checkout -b mpsse master && \ git fetch http://openocd.zylin.com/openocd refs/changes/50/450/3 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/51/451/4 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/52/452/4 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/53/453/4 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/54/454/4 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/33/533/2 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/34/534/2 && \ git cherry-pick FETCH_HEAD && \ git fetch http://openocd.zylin.com/openocd refs/changes/35/535/2 && \ git cherry-pick FETCH_HEAD It does the following: * create a new branch called mpsse which should start where master starts, and checkout this new branch * fetch and then cherry-pick each of the 8 commits in turn For the right sequence of fetch && cherry-pick it's important to check the order in which the commits were uploaded. This is shown in gerrit under Dependencies, and also in Parent(s) for the Patch Set. The above should be the correct order. If some cherry-pick fails I suggest to replace master in the checkout command with the actual commit that Andreas' commits were based on, i.e.: git checkout -b mpsse 21a0f9b48b1694425244b1540012767c443dc16f ..followed by all fetch && cherry-pick commands. There are 103 commits in master since 21a0f9b so it may or may not work to use current master. //Peter ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
