[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gits] Branch Help

On Wed, Jan 08, 2014 at 01:32:43PM -0800, Leigh Stoller wrote:
> > FYI, I?m working on preparing for class, I?ve handed this over to
> > Gary. He will push some new branch to emulab-devel that has just the
> > commits that are supposed to be on the aptui branch

OK, I've made a first stab at this (just in my public repo for now).
Anybody who is curious, have a look at branch "temp-aptui" from this


The HEAD is in almost exactly the same state as aptui from emulab-devel,
(except for the permissions on protogeni/scripts/quickvm.in -- can be
changed later if anybody cares).  You can do a "git diff aptui temp-aptui"
to verify that nothing has been lost.

Also, the new "temp-aptui" branch has a clean history, as a descendent
from emulab-devel master commit 67569c2b (18th December... the last
time the old aptui branch was rebased onto emulab-devel master).  In
other words, everything before that commit is straight out of mainline
master (containing no aptui work), and everything since that commit
is specific to aptui (independent of master).

If everybody is happy with the way it looks, it will be easy to publish
it somewhere final under a proper name, and it should also merge into
master without much difficulty.

Bye for now,
       Gary Wong      gtw at flux.utah.edu      http://www.cs.utah.edu/~gtw/