Re: Tracking a branch using StGIT

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sep 15, 2006, 10:42 UTC
Message-ID: <b0943d9e0609150342y6105d8d1o61abb1934da9f51b@mail.gmail.com>
In-Reply-To: <64de5c8b0609150120h3aeee6dcv976da13134396654@mail.gmail.com>

On 15/09/06, Rajkumar S <rajkumars+git@gmail.com> wrote:

> I am using StGIT to track a branch of a remote git repository
> (actually a remote cvs repository, which I am tracking cvsimport)

[...]

Show 9 quoted lines

> The .git/remotes/origin is
> URL: /usr/local/pfSense/upstream/pfSense/.git
> Pull: refs/heads/master:refs/heads/origin
> Pull: refs/heads/avendor:refs/heads/avendor
> Pull: refs/heads/Package-Reorg-2005:refs/heads/Package-Reorg-2005
> Pull: refs/heads/RELENG_1:refs/heads/RELENG_1
>
> My requirement is to track RELENG_1 branch with StGIT while
> maintaining my own patches. but when I do a stg pull the messages are:

[...]

> It seems StGIT is trying to merge the origin branch from remote to
> RELENG_1 of local. Is there a way to get RELENG_1 of remote to merge
> with MyBranch (clone of "RELENG_1") of local?

After StGIT pops all the patches, it just calls "git pull origin". My understanding of GIT is that this should update local RELENG_1 with the remote RELENG_1 from the "origin" repository. Anything wrong with my assumptions?

-- 
Catalin