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@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@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@capek:/media/hdc6/home/rasz/source/wine$ git fetch rasz@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@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@capek:/media/hdc6/home/rasz/source/wine$ git checkout -f rasz@capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^ dlls/winecoreaudio.drv/mixer.c: needs update rasz@capek:/media/hdc6/home/rasz/source/wine$ git reset --hard origin rasz@capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^ ANNOUNCE: needs update ChangeLog: needs update VERSION: needs update configure: needs update rasz@capek:/media/hdc6/home/rasz/source/wine$ git fetch rasz@capek:/media/hdc6/home/rasz/source/wine$ git checkout -f rasz@capek:/media/hdc6/home/rasz/source/wine$ git diff rasz@capek:/media/hdc6/home/rasz/source/wine$ git reset HEAD^ dlls/user32/tests/menu.c: needs update rasz@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?
RusH wrote:
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.
You probably should read main documentation about GIT then. What we have on wiki is small pieces of information for people who some-what knows GIT.
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 :
[skipped fruitless attempts at braking GIT tree]
rasz@capek:/media/hdc6/home/rasz/source/wine$ git fetch ; git rebase origin dlls/user32/tests/menu.c: needs update
What this tells you is that you have modified dlls/user32/tests/menu.c file. And you either have to commit it, or discard the changes. If you have your modifications in the GIT tree - commit them! If you don't care about any changes in your tree, do 'git checkout -f'.
'git reset HEAD^' does something _completely_ different from what you want. It "undoes" the last commit without modifying the source. You should only use it to edit your own patches that you just committed.
Anyway in short if you just want step-by-step: git commit -a -m junk git fetch git rebase origin git reset HEAD^
This will preserve *all* changes made in the tree. Of course if anything will conflict, you'll have to resolve conflicts yourself.
Vitaliy.
On 6/3/07, Vitaliy Margolen wine-devel@kievinfo.com wrote:
RusH wrote:
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.
You probably should read main documentation about GIT then. What we have on wiki is small pieces of information for people who some-what knows GIT.
but i dont want to know git, i just want to download latest source snapshot.
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 :
[skipped fruitless attempts at braking GIT tree]
rasz@capek:/media/hdc6/home/rasz/source/wine$ git fetch ; git rebase origin dlls/user32/tests/menu.c: needs update
What this tells you is that you have modified dlls/user32/tests/menu.c
No i didnt. I only modified 2 files in wine/dlls/ws2_32/tests. Thats why Im so flustrated. What Git echoes on the screen is is all random garbage to me :/
file. And you either have to commit it, or discard the changes. If you have your modifications in the GIT tree - commit them! If you don't care about any changes in your tree, do 'git checkout -f'.
I did, twice :) and it still complained about something.
'git reset HEAD^' does something _completely_ different from what you want. It "undoes" the last commit without modifying the source. You should only use it to edit your own patches that you just committed.
I dont want to commit anything. Source of my flustration comes from using SVN earlier. In SVN doing 'svn update' will just download latest snapshot, nothing more nothing less, thats what I want from GIT, I dont want to learn it, i dont want to have own tree with own patches, merge commit, submit, none of it. I just want to download latest code, and it takes me 10 minutes typing random commands from wiki.winehq.org/GitWine and hoping for the best until git diff is silent and other commands dont complain "blabla needs update".
So in summary, could someone please add a simple _"svn update" git replacement_ to the wiki?
On Sun, Jun 03, 2007 at 09:47:31PM +0200, RusH wrote:
On 6/3/07, Vitaliy Margolen wine-devel@kievinfo.com wrote:
RusH wrote:
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.
You probably should read main documentation about GIT then. What we have on wiki is small pieces of information for people who some-what knows GIT.
but i dont want to know git, i just want to download latest source snapshot.
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 :
[skipped fruitless attempts at braking GIT tree]
rasz@capek:/media/hdc6/home/rasz/source/wine$ git fetch ; git rebase
origin
dlls/user32/tests/menu.c: needs update
What this tells you is that you have modified dlls/user32/tests/menu.c
No i didnt. I only modified 2 files in wine/dlls/ws2_32/tests. Thats why Im so flustrated. What Git echoes on the screen is is all random garbage to me :/
Use: git checkout dlls/user32/tests/menu.c
for instance.
I dont want to commit anything. Source of my flustration comes from using SVN earlier. In SVN doing 'svn update' will just download latest snapshot, nothing more nothing less, thats what I want from GIT, I dont want to learn it, i dont want to have own tree with own patches, merge commit, submit, none of it. I just want to download latest code, and it takes me 10 minutes typing random commands from wiki.winehq.org/GitWine and hoping for the best until git diff is silent and other commands dont complain "blabla needs update".
So in summary, could someone please add a simple _"svn update" git replacement_ to the wiki?
git commit -a # commit all local changes <add note> git reset --hard HEAD^ # just drop the last commit
git fetch git rebase origin
Ciao, Marcus
RusH wrote:
On 6/3/07, Vitaliy Margolen wine-devel@kievinfo.com wrote:
RusH wrote:
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.
You probably should read main documentation about GIT then. What we have on wiki is small pieces of information for people who some-what knows GIT.
but i dont want to know git, i just want to download latest source snapshot.
wget http://ibiblio.org/pub/linux/system/emulators/wine/wine-0.9.38.tar.bz2
You can get the latest link from http://winehq.org/?announce=latest And forget about GIT. Source control is for developers not users. Especially if you don't want to know it.
Vitaliy.
RusH wrote:
but i dont want to know git, i just want to download latest source snapshot.
Try it using just CVS; that is what I do, it works OK; it justs not the best if you wish to develop for WINE.
Tim S
This is what I think I use to check out the HEAD of the git. FYI: Git supports CVS access if you did not know it.
cvs -z3 -d:pserver:cvs:cvs@cvs.winehq.org:/home/wine checkout wine
RusH wrote:
but i dont want to know git, i just want to download latest source snapshot.
Try it using just CVS; that is what I do, it works OK; it justs not the best if you wish to develop for WINE.
Tim S
This is what I think I use to check out the HEAD of the git. FYI: Git supports CVS access if you did not know it.
cvs -z3 -d:pserver:cvs:cvs@cvs.winehq.org:/home/wine checkout wine
On Sun, Jun 03, 2007 at 09:47:31PM +0200, RusH wrote:
So in summary, could someone please add a simple _"svn update" git replacement_ to the wiki?
git fetch origin git reset --hard origin
Notice that you will loose all changes (contrary to svn update), even the ones you commited.
Not that we have a cvs mirror of the git repository, for more info see http://winehq.org/site/cvs .
Jan
-
Jan Zerebecki -
Marcus Meissner -
RusH -
Tim Stahlhut -
Vitaliy Margolen