Working with the OSCam Emu repository

The oscam-patched repository consists of two branches:

• master branch, which is OSCam already patched with the Emu project.
• oscam-svn branch, which is a clean copy of the OSCam SVN repository.

Developers who want to contribute to the OSCam-Emu project might find these instructions useful.

How to clone the oscam-patched repository and start coding:

First you need to fork the oscam-patched repository under your account. Otherwise you won't be able to commit changes. Then you can clone it locally with:

git clone https://github.com/your-user-name/oscam-patched.git

How to keep your oscam-patched fork in sync with the original oscam-patched repository:

git remote add --track master upstream https://github.com/oscam-emu/oscam-patched.git
git fetch upstream
git checkout master
git merge upstream/master

---

While the oscam-svn branch is updated frequently and kept up-to-date, it is possible to get latest OSCam revisions directly from the OSCam SVN repository. This is not recommended though and the following commands serve as a reference for the Emu project maintainers only.

How to set up your local clone to track the OSCam SVN repository:

git svn init http://www.streamboard.tv/svn/oscam/trunk
git update-ref refs/remotes/git-svn refs/remotes/origin/oscam-svn

How to get new revisions from the OSCam SVN repository:

git checkout oscam-svn
git svn rebase

How to sync OSCam-Emu with new OSCam SVN revisions

git checkout master
git merge oscam-svn