Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] scm next steps

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: "Jeremy Blosser (emrys)" <jblosser-smgl AT firinn.org>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] scm next steps
  • Date: Sat, 6 May 2006 17:31:05 -0500

On Apr 30, Jeremy Blosser (emrys) [jblosser-smgl AT firinn.org] wrote:
> On Apr 29, Jeremy Blosser (emrys) [jblosser-smgl AT firinn.org] wrote:
> > The solution to this is to be be specific when you pull. Since most of
> > you
> > will only be working in test, you want to do your sync from inside a
> > checked out 'master' branch with:
> >
> > git pull . origin
> >
> > (remember, 'origin' is the upstream version of the 'master' aka 'test'
> > branch). This will grab the updates against test and apply them to your
> > checked-out copy of test.
>
> I lied again, you need:
>
> git fetch
> git pull . origin
>
> The fetch is needed first to update the local origin branch against remote.
>
> There should be a git pull syntax to do that all at once, I will keep
> looking. Apologies if this is confusing, the command set is relatively
> simple but like anything else we learn more as we actually use it.

I believe the magic syntax to fetch updates for every remote branch and
update just the working copy to the branch it's on is:

git pull origin

(assuming you are on the master branch; if you're on another branch you'd
need to replace 'origin' with the branch representing that upstream).

Sample confirmation of this, note devel and origin both take updates but
only the origin one is applied:

$ git branch
devel
devel-local
* master
origin
stable-0.3
stable-rc-0.4
$ git pull origin
jblosser AT scm.sourcemage.org's password:
Generating pack...
Done counting 124 objects.
Result has 84 objects.
Deltifying 84 objects.
100% (84/84) done
Unpacking 84 objects
Total 84, written 84 (delta 54), reused 0 (delta 0)
100% (84/84) done
* refs/heads/stable-0.3: same as branch 'stable-0.3' of
ssh://scm.sourcemage.org/smgl/grimoire
* refs/heads/origin: fast forward to branch 'master' of
ssh://scm.sourcemage.org/smgl/grimoire from
1eb35f2a49b4e80949c106b2375396141f2346e1 to
94efe04ed5e3dd4c1291cfd7a67acd850a8496a9
* refs/heads/stable-rc-0.4: same as branch 'stable-rc-0.4' of
ssh://scm.sourcemage.org/smgl/grimoire
* refs/heads/devel: fast forward to branch 'devel' of
ssh://scm.sourcemage.org/smgl/grimoire from
f3497b6128e8b0dc40575c42f7583f563c524faf to
84aa8430647bdc1ceed56a6849c69bd335559b86
jblosser AT scm.sourcemage.org's password:
Updating from 1eb35f2a49b4e80949c106b2375396141f2346e1 to
94efe04ed5e3dd4c1291cfd7a67acd850a8496a9
Fast forward
gnome2-apps/abiword/abiword-2.4.4.tar.bz2.sig | Bin
gnome2-apps/glade-3/DEPENDS | 7
gnome2-apps/glade-3/DETAILS | 16 +
gnome2-apps/glade-3/HISTORY | 5
gnome2-apps/glade-3/glade-3-2.91.1.tar.bz2.sig | Bin
gnome2-apps/pan2/DETAILS | 4
gnome2-apps/pan2/HISTORY | 6
gnome2-apps/pan2/PRE_BUILD | 4
gnome2-apps/pan2/pan.patch | 357
------------------------
gnome2-libs/gdm2/DETAILS | 2
gnome2-libs/gdm2/HISTORY | 3
gnome2-libs/gdm2/gdm-2.14.4.tar.bz2.sig | Bin
gnome2-libs/gdm2/gdm-2.14.5.tar.bz2.sig | Bin
libs/aqbanking/BUILD | 7
libs/aqbanking/DEPENDS | 8 -
libs/aqbanking/HISTORY | 7
libs/libofx/HISTORY | 3
libs/libofx/PREPARE | 2
libs/libxml2/DETAILS | 2
libs/libxml2/HISTORY | 12 +
libs/libxml2/PRE_BUILD | 4
libs/libxml2/SUB_DEPENDS | 2
libs/libxml2/libxml2-2.6.23.tar.gz.sig | Bin
libs/libxml2/libxml2-2.6.24.tar.gz.sig | Bin
libs/libxml2/python-fix.patch | 22 +
libs/libxslt/DETAILS | 3
libs/libxslt/HISTORY | 5
libs/libxslt/PRE_BUILD | 4
libs/libxslt/libxslt-1.1.15.tar.gz.sig | Bin
libs/libxslt/libxslt-1.1.16.tar.gz.sig | Bin
libs/libxslt/python-fix.patch | 12 +
31 files changed, 121 insertions(+), 376 deletions(-)
create mode 100644 gnome2-apps/abiword/abiword-2.4.4.tar.bz2.sig
create mode 100755 gnome2-apps/glade-3/DEPENDS
create mode 100755 gnome2-apps/glade-3/DETAILS
create mode 100644 gnome2-apps/glade-3/HISTORY
create mode 100644 gnome2-apps/glade-3/glade-3-2.91.1.tar.bz2.sig
delete mode 100644 gnome2-apps/pan2/pan.patch
delete mode 100644 gnome2-libs/gdm2/gdm-2.14.4.tar.bz2.sig
create mode 100644 gnome2-libs/gdm2/gdm-2.14.5.tar.bz2.sig
create mode 100755 libs/libxml2/PRE_BUILD
delete mode 100644 libs/libxml2/libxml2-2.6.23.tar.gz.sig
create mode 100644 libs/libxml2/libxml2-2.6.24.tar.gz.sig
create mode 100644 libs/libxml2/python-fix.patch
create mode 100755 libs/libxslt/PRE_BUILD
delete mode 100644 libs/libxslt/libxslt-1.1.15.tar.gz.sig
create mode 100644 libs/libxslt/libxslt-1.1.16.tar.gz.sig
create mode 100644 libs/libxslt/python-fix.patch

Attachment: pgphZ8m4Qmy8r.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page