how to use git as subversion
Locked
123
123
how to use git as subversion
 
|
hi all,
I'm really lost with git. It's complex to understand. I don't want to manage branch in local and all complex situations. By experience, it's dangerous... Typically, i would to continue to work with git as subversion. repository is cloned. No problem. now, i change a change, and i want to "commit" my changes in KDE repository as like "svn ci". I perform "git commit"... git ask comment. fine. In comment i set CCBUGS in comment but nothing append in bugzilla. So i'm not sure that changes are commited. To be sure, i delete my changed files (moves in another place in fact) and i want to perform "svn up" as well. I try "git pull", but git said that there is nothing to do. All is already updated... ARGGGGG... file are deleted ! "git diff" said that files have been removed... but i'm not able to restore it. I'm lost. I thinking that git is not perfect for me, or i'm not adapted to git (:=)))... Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
Hi Gilles,
On 02/06/2011 07:01 PM, Gilles Caulier wrote: > hi all, > > I'm really lost with git. It's complex to understand. > > I don't want to manage branch in local and all complex situations. By > experience, it's dangerous... > > Typically, i would to continue to work with git as subversion. > > repository is cloned. No problem. > > now, i change a change, and i want to "commit" my changes in KDE > repository as like "svn ci". I perform "git commit"... git ask > comment. fine. In comment i set CCBUGS in comment but nothing append > in bugzilla. So i'm not sure that changes are commited. Use git commit -a to have git automatically find the files you changed. Remember that a commit is local, and you have to 'git push' it back to KDE. A nice thing is that once you push, a gitweb url is displayed, so you can see online that the commit is there. > To be sure, i delete my changed files (moves in another place in fact) > and i want to perform "svn up" as well. I try "git pull", but git said > that there is nothing to do. All is already updated... > > ARGGGGG... file are deleted ! > > "git diff" said that files have been removed... but i'm not able to restore it. > > I'm lost. I thinking that git is not perfect for me, or i'm not > adapted to git (:=)))... Maybe this can be of help: http://book.git-scm.com/ I'm also a little bit lost, but I'm sure we'll manage it soon ;-) Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
2011/2/6 Michael G. Hansen <[hidden email]>:
> Hi Gilles, > > On 02/06/2011 07:01 PM, Gilles Caulier wrote: >> hi all, >> >> I'm really lost with git. It's complex to understand. >> >> I don't want to manage branch in local and all complex situations. By >> experience, it's dangerous... >> >> Typically, i would to continue to work with git as subversion. >> >> repository is cloned. No problem. >> >> now, i change a change, and i want to "commit" my changes in KDE >> repository as like "svn ci". I perform "git commit"... git ask >> comment. fine. In comment i set CCBUGS in comment but nothing append >> in bugzilla. So i'm not sure that changes are commited. > > Use > git commit -a > > to have git automatically find the files you changed. Remember that a > commit is local, and you have to 'git push' it back to KDE. A nice thing > is that once you push, a gitweb url is displayed, so you can see online > that the commit is there. So, to resume, "svn ci" = "git commit -a ; git push" not very optimum to work quickly... how to configure an alias with git ? > >> To be sure, i delete my changed files (moves in another place in fact) >> and i want to perform "svn up" as well. I try "git pull", but git said >> that there is nothing to do. All is already updated... >> >> ARGGGGG... file are deleted ! >> >> "git diff" said that files have been removed... but i'm not able to restore it. >> >> I'm lost. I thinking that git is not perfect for me, or i'm not >> adapted to git (:=)))... > > Maybe this can be of help: > > http://book.git-scm.com/ > > I'm also a little bit lost, but I'm sure we'll manage it soon ;-) This is not clear how to sync properly a local repository with KDE. subversion is clearly more simple to use, so far. git sound like a bulldozer... I know, that we can use some great option to manage branch, process merging, check commit about bug, etc. But the lead command for the common job are really not optimized for me. And for the moment, i want to work with git like with subversion. Advanced tools are only 10% of developer work. I'm not against git, but it do not follow CVS and Subversion philosophy, for basic tasks... Gilles > > Michael > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
In reply to this post by Gilles Caulier-4
> > I'm really lost with git. It's complex to understand. :-) This tutorial gives 1:1 translations for SVN commands: http://git.or.cz/course/svn.html As you already found out, git is not svn. With git, your local clone is complete. With "git commit -a" you commit to your local repository. As a second step, you push your changes to the remote repository. You can collect commits, even commit offline, before pushing. The equivalent to "svn up" is "git pull". Not quite - the equivalent is "git pull --rebase". The default, non-rebase will instead do a merge of your local commits. Now if you have understood what I am talking about, you know enough about git! If not, you'll do in a month. Until then, I recommend to git config --global alias.up "pull --rebase" and then just type "git up" from now on. It's better for the occasional local commit. > I don't want to manage branch in local and all complex situations. By > experience, it's dangerous... With git, branches are just so much easier. But I dont want to encourage private branches, development should be in the open after all. > > Typically, i would to continue to work with git as subversion. > > repository is cloned. No problem. > > now, i change a change, and i want to "commit" my changes in KDE > repository as like "svn ci". I perform "git commit"... git ask > comment. fine. In comment i set CCBUGS in comment but nothing append > in bugzilla. So i'm not sure that changes are commited. You need to "git push"... Commit is local so far. Start up "gitk". You'll see that your local branch, "2.0", contains the commit, while the remote branch does not yet. > > To be sure, i delete my changed files (moves in another place in fact) > and i want to perform "svn up" as well. I try "git pull", but git said > that there is nothing to do. All is already updated... > > ARGGGGG... file are deleted ! > > "git diff" said that files have been removed... but i'm not able to restore > it. To undo local changes, use "git checkout", usually "git checkout HEAD <some paths>". To reset local (unpushed) commits, use "git reset". There are some flavors: -- hard, --mixed or --soft. Never use this with pushed commits though... Side note: To amend another change to a local commit, use "git commit -- amend". You cannot amend an already pushed commit. > > I'm lost. I thinking that git is not perfect for me, or i'm not > adapted to git (:=)))... You are not adapted. And nothing is perfect ;-) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
Short summary: git up git commit <path> git push where "git up" is an alias for "git pull --rebase", as given in the longer mail. You can set up to automatically push each commit, but then you lose the ability to have local commits. A diagram: http://www.gitready.com/beginner/2009/01/21/pushing-and-pulling.html# _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
Ah yes. Thanks Marcel, Now it's clear.
In general using local repository is not necessary, excepted in special case. Since long time (time of CVS), i always use the remote repository as reference. open source must be shared with other developpers. The local repository where you can commit is a source of error, i'm sure. I'm not working alone. It just my viewpoint of course... Gilles 2011/2/6 Marcel Wiesweg <[hidden email]>: > > Short summary: > > git up > > git commit <path> > git push > > where "git up" is an alias for "git pull --rebase", as given in the longer > mail. > You can set up to automatically push each commit, but then you lose the > ability to have local commits. > > A diagram: > http://www.gitready.com/beginner/2009/01/21/pushing-and-pulling.html# > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
In reply to this post by Marcel Wiesweg
Marcel,
It's understadable : [gilles@localhost core]$ git up AUTHORS: needs update libs/threads/dynamicthread.cpp: needs update libs/threads/dynamicthread.h: needs update libs/threads/threadmanager.cpp: needs update libs/threads/threadmanager.h: needs update libs/threads/workerobject.cpp: needs update libs/threads/workerobject.h: needs update refusing to pull with rebase: your working tree is not up-to-date git up is this alias git config --global alias.up "pull --rebase" i removed these file by hand, just to check how to restore it as well using remote repository. Result : i cannot => i remove all local clone, and re-checkout all from sctrach. I'm like handicaped with git to just perform simple task. I H.... this versioning tool. Now understand why Google code repository use Mercural ... I stop for now. I'm tired to waste time for today... Gilles 2011/2/6 Marcel Wiesweg <[hidden email]>: > >> >> I'm really lost with git. It's complex to understand. > > :-) > > This tutorial gives 1:1 translations for SVN commands: > http://git.or.cz/course/svn.html > > As you already found out, git is not svn. > With git, your local clone is complete. With "git commit -a" you commit to > your local repository. As a second step, you push your changes to the remote > repository. You can collect commits, even commit offline, before pushing. > > The equivalent to "svn up" is "git pull". Not quite - the equivalent is "git > pull --rebase". The default, non-rebase will instead do a merge of your local > commits. Now if you have understood what I am talking about, you know enough > about git! > If not, you'll do in a month. Until then, I recommend to > git config --global alias.up "pull --rebase" > and then just type "git up" from now on. It's better for the occasional local > commit. > >> I don't want to manage branch in local and all complex situations. By >> experience, it's dangerous... > > With git, branches are just so much easier. But I dont want to encourage > private branches, development should be in the open after all. > >> >> Typically, i would to continue to work with git as subversion. >> >> repository is cloned. No problem. >> >> now, i change a change, and i want to "commit" my changes in KDE >> repository as like "svn ci". I perform "git commit"... git ask >> comment. fine. In comment i set CCBUGS in comment but nothing append >> in bugzilla. So i'm not sure that changes are commited. > > You need to "git push"... Commit is local so far. > Start up "gitk". You'll see that your local branch, "2.0", contains the > commit, while the remote branch does not yet. > >> >> To be sure, i delete my changed files (moves in another place in fact) >> and i want to perform "svn up" as well. I try "git pull", but git said >> that there is nothing to do. All is already updated... >> >> ARGGGGG... file are deleted ! >> >> "git diff" said that files have been removed... but i'm not able to restore >> it. > > To undo local changes, use "git checkout", usually "git checkout HEAD <some > paths>". > To reset local (unpushed) commits, use "git reset". There are some flavors: -- > hard, --mixed or --soft. Never use this with pushed commits though... > Side note: To amend another change to a local commit, use "git commit -- > amend". You cannot amend an already pushed commit. > >> >> I'm lost. I thinking that git is not perfect for me, or i'm not >> adapted to git (:=)))... > > You are not adapted. And nothing is perfect ;-) > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
Marcel,
Just to see, remove a versionned file in local, and try to restore it from remote repository. Good luck... Gilles 2011/2/6 Gilles Caulier <[hidden email]>: > Marcel, > > It's understadable : > > [gilles@localhost core]$ git up > AUTHORS: needs update > libs/threads/dynamicthread.cpp: needs update > libs/threads/dynamicthread.h: needs update > libs/threads/threadmanager.cpp: needs update > libs/threads/threadmanager.h: needs update > libs/threads/workerobject.cpp: needs update > libs/threads/workerobject.h: needs update > refusing to pull with rebase: your working tree is not up-to-date > > git up is this alias > > git config --global alias.up "pull --rebase" > > i removed these file by hand, just to check how to restore it as well > using remote repository. > > Result : i cannot => i remove all local clone, and re-checkout all from sctrach. > > I'm like handicaped with git to just perform simple task. > > I H.... this versioning tool. Now understand why Google code > repository use Mercural ... > > I stop for now. I'm tired to waste time for today... > > Gilles > 2011/2/6 Marcel Wiesweg <[hidden email]>: >> >>> >>> I'm really lost with git. It's complex to understand. >> >> :-) >> >> This tutorial gives 1:1 translations for SVN commands: >> http://git.or.cz/course/svn.html >> >> As you already found out, git is not svn. >> With git, your local clone is complete. With "git commit -a" you commit to >> your local repository. As a second step, you push your changes to the remote >> repository. You can collect commits, even commit offline, before pushing. >> >> The equivalent to "svn up" is "git pull". Not quite - the equivalent is "git >> pull --rebase". The default, non-rebase will instead do a merge of your local >> commits. Now if you have understood what I am talking about, you know enough >> about git! >> If not, you'll do in a month. Until then, I recommend to >> git config --global alias.up "pull --rebase" >> and then just type "git up" from now on. It's better for the occasional local >> commit. >> >>> I don't want to manage branch in local and all complex situations. By >>> experience, it's dangerous... >> >> With git, branches are just so much easier. But I dont want to encourage >> private branches, development should be in the open after all. >> >>> >>> Typically, i would to continue to work with git as subversion. >>> >>> repository is cloned. No problem. >>> >>> now, i change a change, and i want to "commit" my changes in KDE >>> repository as like "svn ci". I perform "git commit"... git ask >>> comment. fine. In comment i set CCBUGS in comment but nothing append >>> in bugzilla. So i'm not sure that changes are commited. >> >> You need to "git push"... Commit is local so far. >> Start up "gitk". You'll see that your local branch, "2.0", contains the >> commit, while the remote branch does not yet. >> >>> >>> To be sure, i delete my changed files (moves in another place in fact) >>> and i want to perform "svn up" as well. I try "git pull", but git said >>> that there is nothing to do. All is already updated... >>> >>> ARGGGGG... file are deleted ! >>> >>> "git diff" said that files have been removed... but i'm not able to restore >>> it. >> >> To undo local changes, use "git checkout", usually "git checkout HEAD <some >> paths>". >> To reset local (unpushed) commits, use "git reset". There are some flavors: -- >> hard, --mixed or --soft. Never use this with pushed commits though... >> Side note: To amend another change to a local commit, use "git commit -- >> amend". You cannot amend an already pushed commit. >> >>> >>> I'm lost. I thinking that git is not perfect for me, or i'm not >>> adapted to git (:=)))... >> >> You are not adapted. And nothing is perfect ;-) >> _______________________________________________ >> Digikam-devel mailing list >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel >> > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
> Just to see, remove a versionned file in local, and try to restore it
> from remote repository. Good luck... git checkout <filename> or git checkout -- <filename> I thought they are should behave differently, but at the moment I'm not able to find the difference I'm kind of newbie with git also, and I know it is frustrating if You can't figure out how to perform a simple svn operation with git. Now, after a month or so, I start to think that git might be a nice system actually. Gert _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
This doen't work really.
From digikam core, i removed AUTHOR file as well (rm -f AUTHOR) [gilles@localhost core]$ git status # On branch 2.0 # Changed but not updated: # (use "git add/rm <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # deleted: AUTHORS # no changes added to commit (use "git add" and/or "git commit -a") [gilles@localhost core]$ and : [gilles@localhost core]$ git checkout D AUTHORS but AUTHOR file still not there. git doen't work as subversion.... why ? As you said, you must be more explicit with git : [gilles@localhost core]$ git checkout AUTHORS [gilles@localhost core]$ ls AUTHORS CMakeLists.txt COPYING.DOC databaseserver/ digikam.lsm.cmake imageplugins/ libs/ NEWS README.FACE themedesigner/ TODO.FACE utilities/ ChangeLog config-digikam.h.cmake COPYING.LIB DESIGN Doxyfile.cmake INSTALL Mainpage.dox project/ showfoto/ tips TODO.MYSQLPORT cmake/ COPYING data/ digikam/ HACKING kioslave/ Messages.sh* README tests/ TODO TODO.QTSCRIPT [gilles@localhost core]$ In this case, file is restored... but it's not user friendly... yes, i'm from old school, but why it's always complex for simple task ? And also, why if i ask to update local copy with remote repository, it refuse to restore the missing file, as subversion do ? I use alias set by git config --global alias.up "pull --rebase" This way to work with this SCM is not logic for me, so far... Gilles 2011/2/7 Gert Kello <[hidden email]>: >> Just to see, remove a versionned file in local, and try to restore it >> from remote repository. Good luck... > > git checkout <filename> > or > git checkout -- <filename> > > I thought they are should behave differently, but at the moment I'm > not able to find the difference > > I'm kind of newbie with git also, and I know it is frustrating if You > can't figure out how to perform a simple svn operation with git. Now, > after a month or so, I start to think that git might be a nice system > actually. > > Gert > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
Incredible :
I just remove some empty line to end of NEWS file from digiKam core, just to test to commit... i use this alias : git config --global alias.ci "commit -a" Now i want to record my change to KDE repository: [gilles@localhost core]$ git ci [2.0 10b7c43] update Committer: Gilles Caulier <[hidden email]> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email [hidden email] If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <[hidden email]>' 1 files changed, 0 insertions(+), 2 deletions(-) [gilles@localhost core]$ git push Warning: Permanently added 'git.kde.org,195.135.221.71' (RSA) to the list of known hosts. Everything up-to-date [gilles@localhost core]$ git status # On branch 2.0 # Your branch is ahead of 'origin/development/2.0' by 1 commit. # nothing to commit (working directory clean) The question is : file is really committed ? the message is not clear for me. If i take a look into Git web interface, it's not committed : https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/master/changes/NEWS What's wrong here ? Gilles 2011/2/7 Gilles Caulier <[hidden email]>: > This doen't work really. > > From digikam core, i removed AUTHOR file as well (rm -f AUTHOR) > > [gilles@localhost core]$ git status > # On branch 2.0 > # Changed but not updated: > # (use "git add/rm <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working directory) > # > # deleted: AUTHORS > # > no changes added to commit (use "git add" and/or "git commit -a") > [gilles@localhost core]$ > > and : > > [gilles@localhost core]$ git checkout > D AUTHORS > > but AUTHOR file still not there. git doen't work as subversion.... why ? > > As you said, you must be more explicit with git : > > [gilles@localhost core]$ git checkout AUTHORS > [gilles@localhost core]$ ls > AUTHORS CMakeLists.txt COPYING.DOC databaseserver/ > digikam.lsm.cmake imageplugins/ libs/ NEWS README.FACE > themedesigner/ TODO.FACE utilities/ > ChangeLog config-digikam.h.cmake COPYING.LIB DESIGN > Doxyfile.cmake INSTALL Mainpage.dox project/ showfoto/ > tips TODO.MYSQLPORT > cmake/ COPYING data/ digikam/ > HACKING kioslave/ Messages.sh* README tests/ > TODO TODO.QTSCRIPT > [gilles@localhost core]$ > > In this case, file is restored... but it's not user friendly... > yes, i'm from old school, but why it's always complex for simple task ? > > And also, why if i ask to update local copy with remote repository, it > refuse to restore the missing file, as subversion do ? I use alias set > by git config --global alias.up "pull --rebase" > > This way to work with this SCM is not logic for me, so far... > > Gilles > > 2011/2/7 Gert Kello <[hidden email]>: >>> Just to see, remove a versionned file in local, and try to restore it >>> from remote repository. Good luck... >> >> git checkout <filename> >> or >> git checkout -- <filename> >> >> I thought they are should behave differently, but at the moment I'm >> not able to find the difference >> >> I'm kind of newbie with git also, and I know it is frustrating if You >> can't figure out how to perform a simple svn operation with git. Now, >> after a month or so, I start to think that git might be a nice system >> actually. >> >> Gert >> _______________________________________________ >> Digikam-devel mailing list >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel >> > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
And i can confirm. I removed all local git repository, and checkout
again whole digikam SC. NEWS file still not changed in KDE Git ! WHY ??? Gilles 2011/2/7 Gilles Caulier <[hidden email]>: > Incredible : > > I just remove some empty line to end of NEWS file from digiKam core, > just to test to commit... > > i use this alias : git config --global alias.ci "commit -a" > > Now i want to record my change to KDE repository: > > [gilles@localhost core]$ git ci > > [2.0 10b7c43] update > Committer: Gilles Caulier <[hidden email]> > Your name and email address were configured automatically based > on your username and hostname. Please check that they are accurate. > You can suppress this message by setting them explicitly: > > git config --global user.name "Your Name" > git config --global user.email [hidden email] > > If the identity used for this commit is wrong, you can fix it with: > > git commit --amend --author='Your Name <[hidden email]>' > > 1 files changed, 0 insertions(+), 2 deletions(-) > [gilles@localhost core]$ git push > Warning: Permanently added 'git.kde.org,195.135.221.71' (RSA) to the > list of known hosts. > Everything up-to-date > [gilles@localhost core]$ git status > # On branch 2.0 > # Your branch is ahead of 'origin/development/2.0' by 1 commit. > # > nothing to commit (working directory clean) > > The question is : file is really committed ? the message is not clear > for me. If i take a look into Git web interface, it's not committed : > > https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/master/changes/NEWS > > What's wrong here ? > > Gilles > > 2011/2/7 Gilles Caulier <[hidden email]>: >> This doen't work really. >> >> From digikam core, i removed AUTHOR file as well (rm -f AUTHOR) >> >> [gilles@localhost core]$ git status >> # On branch 2.0 >> # Changed but not updated: >> # (use "git add/rm <file>..." to update what will be committed) >> # (use "git checkout -- <file>..." to discard changes in working directory) >> # >> # deleted: AUTHORS >> # >> no changes added to commit (use "git add" and/or "git commit -a") >> [gilles@localhost core]$ >> >> and : >> >> [gilles@localhost core]$ git checkout >> D AUTHORS >> >> but AUTHOR file still not there. git doen't work as subversion.... why ? >> >> As you said, you must be more explicit with git : >> >> [gilles@localhost core]$ git checkout AUTHORS >> [gilles@localhost core]$ ls >> AUTHORS CMakeLists.txt COPYING.DOC databaseserver/ >> digikam.lsm.cmake imageplugins/ libs/ NEWS README.FACE >> themedesigner/ TODO.FACE utilities/ >> ChangeLog config-digikam.h.cmake COPYING.LIB DESIGN >> Doxyfile.cmake INSTALL Mainpage.dox project/ showfoto/ >> tips TODO.MYSQLPORT >> cmake/ COPYING data/ digikam/ >> HACKING kioslave/ Messages.sh* README tests/ >> TODO TODO.QTSCRIPT >> [gilles@localhost core]$ >> >> In this case, file is restored... but it's not user friendly... >> yes, i'm from old school, but why it's always complex for simple task ? >> >> And also, why if i ask to update local copy with remote repository, it >> refuse to restore the missing file, as subversion do ? I use alias set >> by git config --global alias.up "pull --rebase" >> >> This way to work with this SCM is not logic for me, so far... >> >> Gilles >> >> 2011/2/7 Gert Kello <[hidden email]>: >>>> Just to see, remove a versionned file in local, and try to restore it >>>> from remote repository. Good luck... >>> >>> git checkout <filename> >>> or >>> git checkout -- <filename> >>> >>> I thought they are should behave differently, but at the moment I'm >>> not able to find the difference >>> >>> I'm kind of newbie with git also, and I know it is frustrating if You >>> can't figure out how to perform a simple svn operation with git. Now, >>> after a month or so, I start to think that git might be a nice system >>> actually. >>> >>> Gert >>> _______________________________________________ >>> Digikam-devel mailing list >>> [hidden email] >>> https://mail.kde.org/mailman/listinfo/digikam-devel >>> >> > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
> And i can confirm. I removed all local git repository, and checkout
> again whole digikam SC. NEWS file still not changed in KDE Git ! > > WHY ??? "git commit" is in Your local machine. You need "git push" to publish Your commit(s) to remote. Gert _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
But i do it !
[gilles@localhost core]$ git push Warning: Permanently added 'git.kde.org,195.135.221.71' (RSA) to the list of known hosts. Everything up-to-date [gilles@localhost core]$ git status # On branch 2.0 # Your branch is ahead of 'origin/development/2.0' by 1 commit. # nothing to commit (working directory clean) ... and nothing change in remote repository... Gilles 2011/2/7 Gert Kello <[hidden email]>: >> And i can confirm. I removed all local git repository, and checkout >> again whole digikam SC. NEWS file still not changed in KDE Git ! >> >> WHY ??? > > "git commit" is in Your local machine. > > You need "git push" to publish Your commit(s) to remote. > > Gert > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
In reply to this post by Gilles Caulier-4
> And also, why if i ask to update local copy with remote repository, it
> refuse to restore the missing file, as subversion do ? I use alias set > by git config --global alias.up "pull --rebase" > > This way to work with this SCM is not logic for me, so far... git is Distributed version control system - it has to work differently. Your computer has full repository - so all that previously did work against server works now in Your local machine. And You have to use additional set of commands to synchronize with remote repositories. Gert _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
2011/2/7 Gert Kello <[hidden email]>:
>> And also, why if i ask to update local copy with remote repository, it >> refuse to restore the missing file, as subversion do ? I use alias set >> by git config --global alias.up "pull --rebase" >> >> This way to work with this SCM is not logic for me, so far... > > git is Distributed version control system - it has to work differently. > > Your computer has full repository - so all that previously did work > against server works now in Your local machine. > > And You have to use additional set of commands to synchronize with > remote repositories. Bahhhhh... Which one ? (:=))) Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
>> And You have to use additional set of commands to synchronize with
>> remote repositories. > > Bahhhhh... Which one ? (:=))) > "git push"? Gert _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
2011/2/7 Gert Kello <[hidden email]>:
>>> And You have to use additional set of commands to synchronize with >>> remote repositories. >> >> Bahhhhh... Which one ? (:=))) >> > "git push"? But i do "git push". Do you read my previous mail ? Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
In reply to this post by Gilles Caulier-4
2011/2/7 Gilles Caulier <[hidden email]>:
> Incredible : > > I just remove some empty line to end of NEWS file from digiKam core, > just to test to commit... > > i use this alias : git config --global alias.ci "commit -a" > > Now i want to record my change to KDE repository: > > [gilles@localhost core]$ git ci > > [2.0 10b7c43] update > Committer: Gilles Caulier <[hidden email]> > Your name and email address were configured automatically based > on your username and hostname. Please check that they are accurate. > You can suppress this message by setting them explicitly: > > git config --global user.name "Your Name" > git config --global user.email [hidden email] > > If the identity used for this commit is wrong, you can fix it with: > > git commit --amend --author='Your Name <[hidden email]>' > > 1 files changed, 0 insertions(+), 2 deletions(-) > [gilles@localhost core]$ git push > Warning: Permanently added 'git.kde.org,195.135.221.71' (RSA) to the > list of known hosts. > Everything up-to-date > [gilles@localhost core]$ git status > # On branch 2.0 > # Your branch is ahead of 'origin/development/2.0' by 1 commit. > # > nothing to commit (working directory clean) > > The question is : file is really committed ? the message is not clear > for me. If i take a look into Git web interface, it's not committed : > > https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/master/changes/NEWS No this url is wrong. this link to trunk repository (1.9.0), not 2.0.0. The right one is : https://projects.kde.org/projects/extragear/graphics/digikam/repository/show?rev=development%2F2.0 Which, do not solve my big problem. Nothing have been committed here.. too bad... Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: how to use git as subversion
|
|
In reply to this post by Gilles Caulier-4
ok, some progress...
Damned... git it's a big puzzle. welcome to future errors... I set this, as Marcel said in a previous mail : [gilles@localhost core]$ git config --global push.default tracking and now, when i touch NEWS file, to commit to remote repository, i can see error messages. File is committed locally : [gilles@localhost core]$ git ci -v [2.0 596dd0e] update 1 files changed, 0 insertions(+), 2 deletions(-) ... It's fine. Now i PUSH the file to remote server : [gilles@localhost core]$ git push -v Pushing to ssh://[hidden email]/digikam Counting objects: 5, done. Delta compression using up to 2 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 288 bytes, done. Total 3 (delta 2), reused 0 (delta 0) remote: Audit failure - Commit 596dd0e1430516916227e970488d03a97f90b7e3 - Email Address - caulier dot gilles at gmail dot com remote: Traceback (most recent call last): remote: File "hooks/update.secondary", line 79, in <module> remote: auditor.audit_metadata() remote: File "/home/git/repo-management/hooks/hooklib.py", line 353, in audit_metadata remote: domain = extraction.group(2) remote: AttributeError: 'NoneType' object has no attribute 'group' remote: error: hook declined to update refs/heads/development/2.0 To ssh://[hidden email]/digikam ! [remote rejected] 2.0 -> development/2.0 (hook declined) error: failed to push some refs to 'ssh://[hidden email]/digikam' What is that (:=)))) Gilles (thinking that Git is an unproductive tool !) 2011/2/7 Gilles Caulier <[hidden email]>: > 2011/2/7 Gert Kello <[hidden email]>: >>>> And You have to use additional set of commands to synchronize with >>>> remote repositories. >>> >>> Bahhhhh... Which one ? (:=))) >>> >> "git push"? > > But i do "git push". Do you read my previous mail ? > > Gilles > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
«
Return to digikam-devel
|
1 view|%1 views
| Free forum by Nabble | Edit this page |