important : Git branch switch

Edward Hervey bilboed at gmail.com
Mon Mar 26 08:23:07 PDT 2012


Hello everyone,

  Wim has currently pushed the branch switches that was discussed last
week, which is another step towards 1.0.

  This means that from now on:
  * All 'master' branches for GStreamer modules on git.freedesktop.org
are for 0.11/1.0 development
  * The previous master branches contents (i.e. tracking the 0.10
development) have been moved to '0.10' branches.

  IMPORTANT : DO NOT DO A GIT PULL IF YOU DO NOT KNOW WHAT YOU ARE
DOING ! Otherwise it will try to merge (or rebase) against a changed
remote branch.

  The easiest is :
  * fetch all remote commits : $ git remote update
    (That won't replace anything locally)
  * Change what upstream branches you are tracking (explained below)
  * And continue business as usual

  Care needs to be taken if you've been doing local development by
instructing which upstream branches to track. The generic command is:
  $ git branch <localbranch> --set-upstream <remote>/<branch>

  Examples:
  If you previously had a local branch called master, which was tracking
origin/master you need to locally instruct git to now track the
origin/0.10 branch:
  $ git branch master --set-upstream origin/0.10

  If you previously had a local branch called 0.11, which was tracking
origin/0.11, you need to locally instruct git to now track the
origin/master branch:
  $ git branch 0.11 --set-upstream origin/master

  And for those who need the full shabbang : If you had a local branch
called 'myawesomeidea', that you had called the freedesktop remote
'ponyrepository' and you were doing work for 0.10 you need to do:
  $ git branch myawesomeidea --set-upstream ponyrepository/0.10

  You can then confirm you've done the proper move by using "git
status".

  Once you have switched which upstream branches each of your local
branches is tracking, you're set.

  Enjoy the hacking and get ready for an awesome 1.0 !

    Edward



More information about the gstreamer-devel mailing list