[Olsr-dev] missing arproaming-plugin
Sat Apr 27 10:52:01 CEST 2013
On 27/04/13 10:47, Henning Rogge wrote:
> Good question, I am not sure there is a good way to keep the history
> without a lot of work (like creating a patch series with all the
> plugin changes).
> Do we NEED the history? Maybe we can just mention the last commit in
> the old master branch in the new commit message?
That's good enough.
> The other question is 'does the arproaming plugin work' or is it still
> 'work in progress'.
Please don't put it in master until you know it works and that it builds
on all relevant platforms.
You can create a feature branch, put the plugin there, and start
adjusting it to the be functional on master.
> On Sat, Apr 27, 2013 at 10:44 AM, Bastian Bittorf
> <(spam-protected)> wrote:
>> the some problem like the OBAMP-plugin occured to
>> the arproaming-plugin, it was scrubbed while merging
>> branches. i can retrieve it via
>> git checkout old-master-branch -- lib/arproaming
>> what is the correct way to move to new master
>> without loosing history?
>> bye, bastian
>> Olsr-dev mailing list
More information about the Olsr-dev