On 9/15/06, Catalin Marinas <catalin.marinas@xxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html