From kde-core-devel  Fri Oct 16 23:10:10 2009
From: Andreas Pakulat <apaku () gmx ! de>
Date: Fri, 16 Oct 2009 23:10:10 +0000
To: kde-core-devel
Subject: Re: Version mismatch when building trunk
Message-Id: <20091016231010.GA29519 () trinity ! apaku ! dnsalias ! org>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=125573467107031

On 16.10.09 16:24:35, Matthew Woehlke wrote:
> Andreas Pakulat wrote:
> >Well, git-challenged can be easily cured. In fact for keeping track of
> >kde-qt you need exactly two very easy to learn commands: git branch and
> >git pull. The first one to select the right branch and the latter to
> >keep that branch up-to-date.
> 
> I think you mean 'git checkout'; 'git branch' *creates* branches, it
> does not switch between branches.

Sorry, of course.

> ...and that's still more than we needed with svn.

actually no, the checkout has been done with svn too. What you didn't do
with svn is cloning the repository.
 
> My update script doesn't like git repos without a 'master' branch,
> so I set up one (locally). Now, is there a way to say that this
> should track some "latest" branch upstream

No, because there's no such thing right now in the kde-qt repo. HEAD
points to the latest stable release. As Thiago said that could be
created however.

> so that 'git pull --rebase' will rebase master less its old upstream

You don't need the --rebase there usually.

Andreas

-- 
Don't kiss an elephant on the lips today.