From: "Rajkumar S" <rajkumars+git@gmail.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Tracking a branch using StGIT
Date: Fri, 15 Sep 2006 17:02:14 +0530 [thread overview]
Message-ID: <64de5c8b0609150432o5d6835a8pb578082746576864@mail.gmail.com> (raw)
In-Reply-To: <b0943d9e0609150342y6105d8d1o61abb1934da9f51b@mail.gmail.com>
On 9/15/06, Catalin Marinas <catalin.marinas@gmail.com> wrote:
> 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?
I checked this again, this time with out using stgit, and the results
are the same. So this is not a StGIT problem but a user error :(
My sequence of test is as follows:
# root@beastie:# git clone /usr/local/pfSense/upstream/pfSense/ releng_1
<snip>
100% (1220/1220) done
# cd releng_1/
# cat .git/remotes/origin
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
# git branch
Package-Reorg-2005
RELENG_1
avendor
* master
origin
# git pull
Already up-to-date.
# git checkout RELENG_1
# git pull
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with c0a06b86b8431293214f5eb18e49fcb8117c6070
Merging:
997e28966d7b7964562232628cc4f64dccbead9e Execute after commands via sh &
c0a06b86b8431293214f5eb18e49fcb8117c6070 Execute after commands via sh &
found 1 common ancestor(s):
1b08ecedad1e6a7199f12d1fad97373587c85454 Minor nitpick. <br> after
firmware branch select box
As you can see, when I switched to RELENG_1 branch and did a git pull,
I am getting errors. I am wondering where I am wrong.
raj
next prev parent reply other threads:[~2006-09-15 11:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-15 8:20 Tracking a branch using StGIT Rajkumar S
2006-09-15 10:42 ` Catalin Marinas
2006-09-15 10:58 ` Andy Whitcroft
2006-09-15 11:17 ` Santi
2006-09-15 11:34 ` Rajkumar S
2006-09-15 11:32 ` Rajkumar S [this message]
2006-09-15 11:42 ` Jakub Narebski
2006-09-15 11:59 ` Rajkumar S
2006-09-15 12:09 ` Jakub Narebski
2006-09-15 12:18 ` Rajkumar S
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64de5c8b0609150432o5d6835a8pb578082746576864@mail.gmail.com \
--to=rajkumars+git@gmail.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).