From: Karl Hasselström <kha@treskal.com>
Date: Thu, 18 Oct 2007 12:51:32 GMT
Subject: Re: Cloning an StGit repository
Message-ID: <20071018125132.GA5403@diana.vm.bytemark.co.uk>
In-Reply-To: <64de5c8b0710180456x24031754od7062d504e72b215@mail.gmail.com>

On 2007-10-18 17:26:48 +0530, Rajkumar S wrote:

> git --bare fetch ../stg_branch my_branch02:my_branch02
> my_branch02:my_branch02 my_branch01:my_branch01  master:master
[...]
> It says
> * refs/heads/my_branch02: not updating to non-fast forward branch
> 'my_branch02' of ../stg_branch
>
> my_branch02 is the StGit managed branch from stg_branch, other
> normal branchs are getting merged. Since this is StGit managed, fast
> forward merge is not possible, I guess. So how can I pull in the
> StGit managed changes to web.git repository?

Either prefix each of the refspects with a + (as in
+my_branch01:my_branch01), or use the -f flag (which has the same
effect as using + on all the refspecs). This will allow the refs to be
overwritten even if it's not a fast-forward.

You have to do this with StGit-managed branches, since StGit is
essentially just a convenient way to rebase commits.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle