• 10 dec 2017: forum version update. In case of issues use this topic.
  • 30 nov 2017: pilight moved servers. In case of issues use this topic.
Hello There, Guest! Login Register


Thread Rating:
  • 2 Vote(s) - 3.5 Average
  • 1
  • 2
  • 3
  • 4
  • 5
HowTo Move your 3rd party code code from development to rewrite
#1
3rd party development is normally done in forked/cloned repository and in an individual branch, called for example "new_protocol". All those branches are supposed to be based on development. Once the software is ready, a pull request is issued to the maintainers of the main pilight repository and after a review accepted and merged into the corresponding branch development respectivly into rewrite

In order to re-apply work done from the development branch to the rewrite branch, on your local repository all that needs to be done is to rebase that branch on rewrite.

Step 1: Checkout "new_protocol": git checkout new_protocol
Step 2: Rebase the branch on rewrite: git rebase rewrite

If conflicts occur, they need to get fixed before the "git rebase" command can be completed.

If you do simultaneous development on both branches, use git cherry-pick.

If git is traversing back thru changes others, you may want to apply individual changes only, use "git format-patch" to check the patches you want to apply only (at the time of this writing, the zwave modification on development, which i had already included in my own local development branch, that were giving me some headaches).

I have discussed a complete development cycle for the development branch and the rewrite branch on a local repository in this thread..
 
Reply
  


Possibly Related Threads...
Thread Author Replies Views Last Post
  program protocol missing in rewrite Niek 1 439 10-07-2017, 08:55 PM
Last Post: curlymo
  rewrite fails to compile ma-ca 24 3,458 09-01-2017, 11:57 AM
Last Post: wseifert
  daemon crashes in rewrite ma-ca 1 556 08-05-2017, 03:40 PM
Last Post: curlymo
  dim action fails in rewrite ma-ca 1 467 08-04-2017, 05:16 PM
Last Post: curlymo
  pilight rewrite branch fails to compile ebk 0 704 06-30-2017, 01:07 PM
Last Post: ebk
  Rewrite development status TopdRob 1 1,121 12-10-2016, 10:31 PM
Last Post: curlymo
  [fixed] bug fix for ds18b20.c rewrite branch beaming 1 1,034 05-13-2016, 06:27 AM
Last Post: curlymo

Forum Jump:


Browsing: 1 Guest(s)