[mythtv] [mythtv-commits] Ticket #9374: [PATCH] New build script for Windows

Lawrence Rust lvr at softsystem.co.uk
Thu Dec 16 21:02:00 UTC 2010


On Wed, 2010-12-15 at 15:38 -0500, Craig Treleaven wrote:
> At 5:22 PM +0000 12/14/10, "MythTV" wrote:
> >#9374: [PATCH] New build script for Windows
> >-------------------------------------+-------------------------------------
> >     Reporter:  Lawrence Rust        |      Owner:  nigel
> >  <lvr@>                            |     Status:  new
> >         Type:  Patch - Feature      |  Milestone:  unknown
> >     Priority:  minor                |    Version:  Unspecified
> >    Component:  Ports - Windows      |   Keywords:  Build script packager
> >     Severity:  medium               |  windows
> >Ticket locked:  0                    |
> >-------------------------------------+-------------------------------------
> > Following the move to git ...
> >
> > - Easily switch between master and fixes branches.[[BR]]
> 
> Hi:
> 
> I'm (messing around) updating the osx-packager.pl script and was looking at your's for inspiration. OK, stealing everything I could! ;-)
> 
> Is my understanding of git correct?  I believe we should use 'git clone' to pull a current copy of the code onto a local machine.
OK

>   Then 'git checkout' to switch from one branch to another.
OK

>   (Same for tags?)
OK

>   It seems to me that we need to use 'git pull', subsequently, to update our local copy with remote changes.
Yes, when you are happy.

>   I don't see your code doing that.
No it doesn't - intentionally.  This is to allow the developer to make
their changes, re-build and test and then pull changes when they're
happy.  A pull can overwrite your uncommitted changes or end up in a
messy merge.  Even the git checkout to a different branch can fail if
you have uncommitted changes.

The script is not a tool for managing git but just the builds.  It uses
git to grab the sources to help the uninitiated.

>   A second run of 'git clone' errors out on me because the destination directory is not empty.
The script will only 'git clone' if the original directory is missing.
Otherwise the error is expected.  If you want to reset the tree:
git clean -fxd
get checkout .

Then a git pull will give you a clean branch - hope you stashed your
changes?

-- Lawrence




More information about the mythtv-dev mailing list