[Debian-olpc-devel] How _should_ we import new changes into git?

[Luke Faraone]

On Sat, Jan 17, 2009 at 4:27 PM, Jonas Smedegaard <dr at jones.dk> wrote:

> On Sat, Jan 17, 2009 at 01:35:19PM -0500, Luke Faraone wrote:
> >On Wed, 2009-01-14 at 23:45 +0100, Jonas Smedegaard wrote:
> >> Current source handling is already too complex: Noone except me is
> >> packaging!
>

I'm currently unable to follow the instructions provided in the
README.packaging file, maybe I've failed to set up my local environment
correctly?

I've pulled from git://git.debian.org/collab-maint/sugar.git, so (AFAIN) I
should have pretty much the same setup as you do, yet the commands I am
running fail to work.

lfaraone at opus:~$ git clone git://git.debian.org/collab-maint/sugar.git
Initialized empty Git repository in /home/lfaraone/sugar/.git/
remote: Counting objects: 33553, done.
remote: Compressing objects: 100% (8708/8708), done.
remote: Total 33553 (delta 25296), reused 32887 (delta 24683)
Receiving objects: 100% (33553/33553), 5.63 MiB | 1249 KiB/s, done.
Resolving deltas: 100% (25296/25296), done.
Checking out files: 100% (297/297), done.
lfaraone at opus:~$ cd sugar
lfaraone at opus:~/sugar$ git fetch origin upstream:upstream