[En-Nut-Discussion] More tweaks to the edline line editor

Harald Kipp harald.kipp at egnite.de
Wed Nov 19 18:12:51 CET 2014

On 16.11.2014 21:20, Philipp Burch wrote:
> I made some more tweaks to the edline line editor to improve the
> usability when accessing it over a Telnet connection. The changes are
> split over three distinct commits (r5894 .. r5896) into the devnut_tiva
> branch, whereas the below patch combines them all in one. The commit
> messages are as follows:

Many thanks, r5907 merges them into the trunk. To make your life easier, it is actually sufficient to let us know the related revision numbers.

For *all* maintainers: 

You can always check for eligible patches from another branches (devnut_tiva in our case) with

 svn mergeinfo svn+ssh://username@svn.code.sf.net/p/ethernut/code/branches/devnut_tiva --show-revs eligible

To view the changes of a specific patch use

 svn diff -c <rev#> svn+ssh://username@svn.code.sf.net/p/ethernut/code/branches/devnut_tiva

To merge this revision use

 svn diff -c <rev#> svn+ssh://username@svn.code.sf.net/p/ethernut/code/branches/devnut_tiva

If something went wrong, you can still

 svn revert


 svn commit

I'm just writing this because I hardly remember that someone here stated that cherry picking (means merging selected patches) isn't possible with subversion. The opposite is true, the way I demonstrated above is required! Otherwise you may run into problems when later re-integrating a branch.

Hope this simple recipe is helpful. The deeper details are explained in the manual at http://svnbook.red-bean.com/



More information about the En-Nut-Discussion mailing list