git is to overwhelming

RusH citizenr at gmail.com
Sun Jun 3 13:35:22 CDT 2007


Maybe im just to stupid for it :(
I want to use git to download most current source, try my patches,
then to again download most current source. I cant do it.
wiki.winehq.org/GitWine
doesnt help at all.
For example I had wine-0.9.37 fetched, added few patches, compiled it,
installed locally, all was fun and games, Now I want to bring my local
tree to current level, but cant. I did :

rasz at capek:/media/hdc6/home/rasz/source/wine$ git fetch
remote: Generating pack...
[.....cut.....]
 100% (1/1) done
* refs/tags/wine-0.9.38: storing tag 'wine-0.9.38' of
git://source.winehq.org/git/wine
  tag: d3ce69c
rasz at capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^
dlls/winecoreaudio.drv/mixer.c: needs update
dlls/ws2_32/tests/sock.c: needs update
rasz at capek:/media/hdc6/home/rasz/source/wine$ git fetch
rasz at capek:/media/hdc6/home/rasz/source/wine$ git rebase origin
dlls/winecoreaudio.drv/mixer.c: needs update
dlls/ws2_32/tests/sock.c: needs update
rasz at capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^
dlls/winecoreaudio.drv/mixer.c: needs update
dlls/ws2_32/tests/sock.c: needs update
rasz at capek:/media/hdc6/home/rasz/source/wine$ git checkout -f
rasz at capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^
dlls/winecoreaudio.drv/mixer.c: needs update
rasz at capek:/media/hdc6/home/rasz/source/wine$ git reset --hard origin
rasz at capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^
ANNOUNCE: needs update
ChangeLog: needs update
VERSION: needs update
configure: needs update
rasz at capek:/media/hdc6/home/rasz/source/wine$ git fetch
rasz at capek:/media/hdc6/home/rasz/source/wine$ git checkout -f
rasz at capek:/media/hdc6/home/rasz/source/wine$ git diff
rasz at capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^
dlls/user32/tests/menu.c: needs update
rasz at capek:/media/hdc6/home/rasz/source/wine$ git fetch ; git rebase origin
dlls/user32/tests/menu.c: needs update

and so on and so forth .... my head hurts and i dont understand, why
cant it be done with one command?


-- 
Who logs in to gdm? Not I, said the duck.



More information about the wine-devel mailing list