Uploaded servo stretching mods to repository

This forum is dedicated to software development related to MultiWii.
It is not the right place to submit a setup problem.
Software download
Post Reply
cass3825
Posts: 14
Joined: Thu Mar 31, 2011 3:09 am

Uploaded servo stretching mods to repository

Post by cass3825 »

Alex,
I finally uploaded the servo stretching code modifications and VTOL definitions to the repository into a branch under my username. Unfortunately, the modifications were done to dev0903. What is the easiest way of incorporating these changes into the latest dev code?

PatrikE
Posts: 1976
Joined: Tue Apr 12, 2011 6:35 pm
Location: Sweden
Contact:

Re: Uploaded servo stretching mods to repository

Post by PatrikE »

Use Winmerge.
http://winmerge.org/

You can compare 2 folders and stich them together.

Alexinparis
Posts: 1630
Joined: Wed Jan 19, 2011 9:07 pm

Re: Uploaded servo stretching mods to repository

Post by Alexinparis »

Hi,

I think the best way to follow the dev versions with the mods is to use tortoise svn code browser. (free software)
You could build a branch of the project in the google code repository, and then there is a nice functionality to see the differences between files (the diff command).
With the SVN checkout function of tortoise, it's very simple to follow and include the last changes, and then commit your own code after.

Post Reply