Re: [Libreoffice] How do I update my download?

On 28/01/11 17:14, Norbert Thiebaud wrote:
> On Thu, Jan 27, 2011 at 9:56 PM, Ron House<rhouse@smartchat.net.au>  wrote:
> > Hi, sorry for a beginner's question, but I downloaded the libreoffice code
> > base from git about a month ago, and I want to update it to be the same as
> > the recently released version 3.3 without having to download it all again.
> > Can anyone help out? I think, but am not sure, that the version I have is
> > what in cvs is called the head - not sure about git terminology.
> >
> > If it is too hard to convert to version 3.3, then how do I simply update the
> > version I have from the current git repositories?
>
> Normally it should as simple as refreshing your git repositories and
> switching branch... the problem is that
> since then the main branch has known some important change in the way
> we build things...
> so I suggest you do this:
>
> ./bin/g fetch
>
> ./bin/g checkout libreoffice-3.3.0 origin/libreoffice-3.3.0
>
> and then build the way you did last time (autogen etc...)
>
> Norbert
>
> Note that your branch 'master' won't be updated. this was on purpose
> (./bin/g fetch instead of the more tradition - for us - ./bin/g pull
> -r)
> to allow you to switch to the libreoffcie-3.3.0 branch without too
> many manual tweaking

Hi Norbert,

I have tried this but ran into some problems:

./bin/g - no such command, so I used git-fetch instead. That command 
worked and said:

remote: Counting objects: 2442, done.
remote: Compressing objects: 100% (1001/1001), done.
remote: Total 2113 (delta 1613), reused 1426 (delta 1102)
Receiving objects: 100% (2113/2113), 370.47 KiB | 57 KiB/s, done.
Resolving deltas: 100% (1613/1613), completed with 129 local objects.
From git://anongit.freedesktop.org/libreoffice/bootstrap
 * [new branch]      feature/gnumake2.1 -> origin/feature/gnumake2.1
   672fafb..44f0576  feature/helppack -> origin/feature/helppack
   ec64258..afbf70e  feature/layout -> origin/feature/layout
   977dc85..3bbb389  libreoffice-3-3 -> origin/libreoffice-3-3
 * [new branch]      libreoffice-3-3-0 -> origin/libreoffice-3-3-0
   d9f0a7c..b303988  master     -> origin/master
 * [new tag]         libreoffice-3.3.0.4 -> libreoffice-3.3.0.4
From git://anongit.freedesktop.org/libreoffice/bootstrap
 * [new tag]         libreoffice-3.3.0.3 -> libreoffice-3.3.0.3
 * [new tag]         ooo/OOO330_m19 -> ooo/OOO330_m19

I assume that's about right. But:

git-checkout libreoffice-3.3.0 origin/libreoffice-3.3.0

Said:

error: pathspec 'libreoffice-3.3.0' did not match any file(s) known to git.
error: pathspec 'origin/libreoffice-3.3.0' did not match any file(s) 
known to git.

Since, despite reading the man pages, I don't really understand git (and 
would prefer not to have to, if I can get to editing the code without 
it), I don't understand what we are trying to do here and so I am not 
sure what the fix should be. I am a bit paranoid and don't want to 
experiment with something that needs so much downloading in case I mess 
things up well and truly.

Am I making some obvious mistake?

Thanks,
Ron

--
Ron House
Building Peace: http://peacelegacy.org
Australian Birds: http://wingedhearts.org
Principle of Goodness academic site: http://principleofgoodness.net