anjohnson

Andrew's Notes on using Git with Launchpad

This page describes how I'm planning to work with git and lp, others don't have to follow my approach. The mirroring that I describe below may be slightly unusual, so your local git expert might not fully understand it.

Getting Started

Configure the lp: prefix in ~/.gitconfig

[url "git+ssh://[email protected]/"]
    insteadof = lp:

anjohnson

EPICS V4 C++ Bundle Release Checklist

Some of the non-git commands below are recorded for Andrew's benefit and might not work for other people.

1. Check out the bundleCPP module and configure the modules

   $ git clone --recursive --branch release/4.6.0 [email protected]:epics-base/bundleCPP.git
   $ make config EPICS_BASE=/path/to/base

anjohnson

Triangle Workflows

A triangle workflow involves an upstream project and a personal fork containing a development branch of the project. This configuration makes git pull merge changes from the upstream but git push send local commits to the personal fork. However those config settings only work on relatively recent versions of git; 1.7.9 doesn't support the required remote.pushdefault config setting so you will have to explicitly tell git push which remote to push to.

This gist does not attempt to explain exactly what these commands do, it's intended as a cheat-sheet/reminder.

To set up a project area

anjohnson

Github pull request handling for the EPICS V4 Working Group

• Module owners may commit and push minor changes directly to the master branch of their own modules on github.
• For major changes that should be tested and reviewed by other people, module owners should work in a private repository and create a pull request when the work is ready for review.
• Anybody may create or comment on a pull request on any module -- this includes unsolicited contributions from non-members.
• A module's owner normally makes the final decision on merging pull requests for their modules and performs the merge (in many cases this just means pushing the green Merge button on the pull request webpage and confirming the merge).
• A meeting of the working group may nominate someone other than a module's owner to perform merge operations for specific changes discussed by the group.
• Large or API-changing modifications should never be merged without allowing time for discussion, which should happen through the gith

anjohnson

How to set up a PC as an unattended Kiosk running a closed website, using Ubuntu 14.04.02 LTS.

These instructions assume that you're familiar with Linux and system administration.

You will need an internet connection to set up the kiosk, even if all the pages will be loaded from disk when it's running.

Note that a "closed" website is one with no links to other websites or to pages with no links back to the rest of the site. The idea here is to only allow users to access a limited set of pages since the kiosk is provided for a specific purpose. If you develop your own content for the kiosk to display, make sure that all pages have at least one link back to the rest of the site; the Back button isn't displayed by Chromium when in kiosk mode.