forgive me if this post is long winded but i find myself
unable to perform a 'git pull' and i don't know where along
the line i did the wrong thing
also my steps and mis-steps may provide guideposts for
others wanting to test the git waters
starting from markus' now famous url
http://repo.or.cz/w/vim_extended.git
i found a README (with line numbers!) at a Documentation
link and tried to pick out what i needed
i created a new path for the experiment:
~/.build/vim/vim72
(when using svn the path wanted to be ...vim7.2, so this is
cleaner)
< ONE >
from line 85 of the README
git clone git://repo.or.cz/vim_extended.git
< TWO >
from line 92
cd vim_extended
< THREE >
line 121
git checkout -b custom origin/vim-with-runtime
< FOUR >
line 125
git merge origin/feat/rel-line-numbers
< FIVE >
line 139
git mergetool
showed nothing that needed to be fixed
lines 147-232 of the README detail a merge of runtime files that
looked both confusing and unnecessary -- we got the runtime when we
chose "vim-with-runtime" back in step three -- so far no gaps in the
runtime have presented themselves
lines 235-254 also has to do with runtime, but, as above, we already
have it -- this section appears to be if you want a git branch of just
runtime
lines 257-275 show how to use rsync to update the runtime into git's
origin/stuff branch, whatever that is, but again we already have the
runtime, and I *think* future 'git pull's will retrieve updates to the
runtime as well as the source
from here it was a matter of first forgetting, then remembering to
update src/feature.h to remove some code bloat i know i will never
want -- then a typical make and make install -- all went
well, vim 7.2.102 was successfully built and installed with
the relative number patch, and i went to bed happy
on day two it was time to test our installation and perform
our first 'git pull'
#!/bin/bash
tail ~/.build/vim/vim72/vim_extended/update.log
dttm | tee -a ~/.build/vim/vim72/vim_extended/update.log
git pull 2>&1 | tee -a ~/.build/vim/vim72/vim_extended/update.log
dsh 60 | tee -a ~/.build/vim/vim72/vim_extended/update.log
this did not go well -- it yielded:
Warning: No merge candidate found because value of config option
"branch.custom.merge" does not match any remote branch fetched.
for me, git branch -a shows:
~/.build/vim/vim72/vim_extended $ git branch -a
* custom
master
origin/HEAD
origin/feat/code-check
origin/feat/emb-common-lisp
origin/feat/float-point-ext
origin/feat/lua
origin/feat/rel-line-numbers
origin/feat/var-tabstops
origin/fix/fast-join
origin/master
origin/stuff
origin/vim
origin/vim-runtime
origin/vim-with-runtime
and my .git/config contains:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git://repo.or.cz/vim_extended.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
so now you see how someone new to git might go astray trying
to follow the README -- or maybe if markus is too busy at
FOSDEM someone else can help before he gets back...
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
