Re: Git migration...
On 12-05-2008, Stefano Zacchiroli <[EMAIL PROTECTED]> wrote: > On Mon, May 12, 2008 at 09:24:02AM +, Sylvain Le Gall wrote: > > PS regarding "asking questions" I indeed liked the darcs default of >doing that. Git is lacking it, though in the most important cases you >have flags to trigger it. If you are not already aware of it, I >recommend looking at "git add -p" which provides an interactive loop >to add specific changes in a given file. That was the most useful >"set of questions" I remember from darcs. > Indeed, i was not knowning this flags. Just use it... Sound what i was looking for... Thanks for the tip. Regards, Sylvain Le Gall -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Git migration...
On Mon, May 12, 2008 at 09:24:02AM +, Sylvain Le Gall wrote: > Concerning the "waste of time", i disagree. Git is not the final SCM > around. There will be other. Understanding git, darcs, tla, cvs, svni, This was not the point of my "waste of time", no praise to git was intended. It is rather learning another tool wrt the one you are going to use. It would have been, in my opinion, the very same waste of time to suggest someone which does not know anything about $VCS, to learn CVS before moving to Subversion. That sounds like a waste of time to me. YMMV. Cheers. PS regarding "asking questions" I indeed liked the darcs default of doing that. Git is lacking it, though in the most important cases you have flags to trigger it. If you are not already aware of it, I recommend looking at "git add -p" which provides an interactive loop to add specific changes in a given file. That was the most useful "set of questions" I remember from darcs. -- Stefano Zacchiroli -*- PhD in Computer Science ... now what? [EMAIL PROTECTED],cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ?/\All one has to do is hit the (15:57:15) Bac: no, la demo scema\/right keys at the right time signature.asc Description: Digital signature
Re: Git migration...
there is also this script that can make it easier to learn all the git commands... http://www.gnome.org/~newren/eg/ they say it's made for svn users... :) p On Sat, May 10, 2008 at 06:58:50PM +0200, Ralf Treinen wrote: > On Sat, May 10, 2008 at 06:46:25PM +0200, Stefano Zacchiroli wrote: > > On Sat, May 10, 2008 at 02:20:25PM +0200, Stéphane Glondu wrote: > > > > BTW, what will be our plans for the migration? > > > > Was I sure that we will *not* go for the 3.10.2 transition before Lenny > > I would answer: let's do the git migration right away. Given that we are > > probably going to have a 3.10.2 transition I would wait for that: I do > > not want to "waste" people energy in learning a new tool *during* the > > transition. Bottom line: I propose to do it as soon as one of the two > > happen: we complete the 3.10.2 transition, we know for sure there won't > > be any 3.10.2 transition in Lenny time. > > Yes, that seems reasonable. > > BTW, what would you suggest to read as an introduction into concurrent > version control systems and git? I have to admit that I am still > living in the cvs/svn age. > > -Ralf. > > > -- > To UNSUBSCRIBE, email to [EMAIL PROTECTED] > with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Git migration...
On 11-05-2008, Stefano Zacchiroli <[EMAIL PROTECTED]> wrote: > > --x+6KMIRAuhnl3hBn > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > On Sun, May 11, 2008 at 06:04:38PM +, Sylvain Le Gall wrote: >> I would better recommend beginning with "darcs" rather than "git". They >> share almost all principle, but "darcs" is more user friendly. Once you >> have get the basic principle of DSCM (get/pull/push/...), you should go >> to git.=20 > > If your end is using git, this looks like a waste of time to me. > Also, IIRC, git documentation is way better than darcs'. > Darcs way of doing is to "ask question". This is not only a matter of documentation, but also a matter of interaction. Experimenting with darcs is simple and straight and give you a "sense of control", that git is lacking (this is only a feeling). Also darcs has a very small set of commands, which can be found in git. In fact, 1.5 year ago, i give at tla and darcs a try (git was not on the list at this time). If i don't have try darcs i think i would never has understood tla (but i give up understanding tla, which is kind of too much complex for a simple task). Coming from darcs to git was easier... Concerning the "waste of time", i disagree. Git is not the final SCM around. There will be other. Understanding git, darcs, tla, cvs, svni, rcs, sccs and other help you understand what will come next. Learning is never a waste of time ;-) But i think i am a little out of topic with this post. Sorry. Anyway, Ralf is free to learn directly git (for learning git) or to try to broaden the field and understand distributed SCM -- which includes git. Regards, Sylvain Le Gall ps: i am not trying to explain that darcs is better than git, i really don't think so -- darcs has a lot of problems that git doesn't have... -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Git migration...
On Sun, May 11, 2008 at 06:04:38PM +, Sylvain Le Gall wrote: > I would better recommend beginning with "darcs" rather than "git". They > share almost all principle, but "darcs" is more user friendly. Once you > have get the basic principle of DSCM (get/pull/push/...), you should go > to git. If your end is using git, this looks like a waste of time to me. Also, IIRC, git documentation is way better than darcs'. Cheers. -- Stefano Zacchiroli -*- PhD in Computer Science ... now what? [EMAIL PROTECTED],cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ?/\All one has to do is hit the (15:57:15) Bac: no, la demo scema\/right keys at the right time signature.asc Description: Digital signature
Re: Git migration...
On Sun, May 11, 2008 at 18:04:38 +, Sylvain Le Gall wrote: > I would better recommend beginning with "darcs" rather than "git". They > share almost all principle, but "darcs" is more user friendly. Once you > have get the basic principle of DSCM (get/pull/push/...), you should go > to git. > I guess that depends on the user, then, because I still can't manage to grok darcs, and I use git just fine (having switched to it from svn some time ago). Cheers, Julien -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Git migration...
Hello, On 11-05-2008, Stefano Zacchiroli <[EMAIL PROTECTED]> wrote: > > --HlL+5n6rz5pIUxbD > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > On Sat, May 10, 2008 at 06:58:50PM +0200, Ralf Treinen wrote: >> BTW, what would you suggest to read as an introduction into concurrent >> version control systems and git? I have to admit that I am still=20 >> living in the cvs/svn age. > > No problem, I was there not more than 6 months ago :-) > > On the Git website (http://git.or.cz) there is quite a lot of quite good > documentation, and the Git community is great. There is a tutorial to [...] I would better recommend beginning with "darcs" rather than "git". They share almost all principle, but "darcs" is more user friendly. Once you have get the basic principle of DSCM (get/pull/push/...), you should go to git. Stepping directly from svn/cvs to git is not the easy way. There is a good documentation on http://www.darcs.net/ Once you have understand darcs, trying git will be easier. Regards, Sylvain Le Gall -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Git migration...
On Sat, May 10, 2008 at 06:58:50PM +0200, Ralf Treinen wrote: > BTW, what would you suggest to read as an introduction into concurrent > version control systems and git? I have to admit that I am still > living in the cvs/svn age. No problem, I was there not more than 6 months ago :-) On the Git website (http://git.or.cz) there is quite a lot of quite good documentation, and the Git community is great. There is a tutorial to get started at http://www.kernel.org/pub/software/scm/git/docs/tutorial.html , but beside being a good tutorial it won't let you grasp the way of reasoning behind git (I read it, but when I started using git I was still missing a lot of important stuff). Other "quick" pieces of documentation are listed at http://git.or.cz/#documentation . On the contrary, I was very satisfied by the user manual (http://www.kernel.org/pub/software/scm/git/docs/user-manual.html). I found it very well written and written to be read sequentially without too much committed. I started reading it since the beginning splitting the read in various days: it was enjoyable and useful. If you have more than half an hour to spare reading docs, I recommend going for that manual. There are also a couple of Google Tech Talks on youtube on the git topic. One is from Linus (http://youtube.com/watch?v=4XpnKHJAok8) and the other is from Randall Schwartz (http://youtube.com/watch?v=8dhZ9BXQgc4). Both to me were more on the enjoy/fun side than on the "learn something" side, Linus' is more fun, Randall' is more tech. The IRC channel #git on freenode is amazingly friendly and open both to newbie and hardcore git questions. Though also on #debian-devel you can find the "dynamic duo" madduck/Madcoder which are always ready to get involved in git topics. Cheers. -- Stefano Zacchiroli -*- PhD in Computer Science ... now what? [EMAIL PROTECTED],cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ?/\All one has to do is hit the (15:57:15) Bac: no, la demo scema\/right keys at the right time signature.asc Description: Digital signature
Re: Git migration...
On Sat, May 10, 2008 at 06:46:25PM +0200, Stefano Zacchiroli wrote: > On Sat, May 10, 2008 at 02:20:25PM +0200, Stéphane Glondu wrote: > > BTW, what will be our plans for the migration? > > Was I sure that we will *not* go for the 3.10.2 transition before Lenny > I would answer: let's do the git migration right away. Given that we are > probably going to have a 3.10.2 transition I would wait for that: I do > not want to "waste" people energy in learning a new tool *during* the > transition. Bottom line: I propose to do it as soon as one of the two > happen: we complete the 3.10.2 transition, we know for sure there won't > be any 3.10.2 transition in Lenny time. Yes, that seems reasonable. BTW, what would you suggest to read as an introduction into concurrent version control systems and git? I have to admit that I am still living in the cvs/svn age. -Ralf. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Git migration...
On Sat, May 10, 2008 at 02:20:25PM +0200, Stéphane Glondu wrote: > I've written (yet another) svn2git migration script¹ specialized for > our svn layout, that handles upstream branches. I haven't yet looked at the code, will do next week (as well as the testing/feedback you required). Can you please just comment on the disk usage of generate repository. My previous attempt at the migration script was careful about removing all tracks of verbatim tarballs in the history as to minimize disk usage (and getting rid of all the places where the tarballs have been stored wasn't easy). Did you inherit that nice property from the predecessor? Beside that: thanks a lot for the new script! > I've not tried yet with "big" packages such as ocaml itself. It sould In my experience the difference between the "big" one and the others was noticeable in what needed to be addressed, please test drive on ocaml itself. > * The mapping from alioth logins to full names is hard-coded in the script. Cool this mean you do the expansions :) I think that supporting all the user names we currently have in the alioth project is enough. > BTW, what will be our plans for the migration? Was I sure that we will *not* go for the 3.10.2 transition before Lenny I would answer: let's do the git migration right away. Given that we are probably going to have a 3.10.2 transition I would wait for that: I do not want to "waste" people energy in learning a new tool *during* the transition. Bottom line: I propose to do it as soon as one of the two happen: we complete the 3.10.2 transition, we know for sure there won't be any 3.10.2 transition in Lenny time. Cheers. -- Stefano Zacchiroli -*- PhD in Computer Science ... now what? [EMAIL PROTECTED],cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ?/\All one has to do is hit the (15:57:15) Bac: no, la demo scema\/right keys at the right time signature.asc Description: Digital signature
Git migration...
Hello, I've written (yet another) svn2git migration script¹ specialized for our svn layout, that handles upstream branches. ¹ http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/tools/svn2git/glondu_svn2git.py?op=file&rev=0&sc=1 It successfully generated the following repos: http://git.debian.org/?p=users/glondu-guest/test/ocaml-csv.git http://git.debian.org/?p=users/glondu-guest/test/ocaml-sqlite3.git http://git.debian.org/?p=users/glondu-guest/test/ocsigen.git I've tried to write it in such a way that it fails should anything go not according to what I expect... so it will probably fail with many other repos :-) I've not tried yet with "big" packages such as ocaml itself. It sould be easily debuggable, though. Since it is self contained and uses only basic commands, it should be easily adapted to whatever processing we would like to do on the fly. Some caveats and possible future improvements: * The mapping from alioth logins to full names is hard-coded in the script. * File renamings/movings might be seen as deletions/creations (with all drawbacks)... but I don't know if svn itself tracks such modifications differently. Anyway, git-import-orig should have the same behaviour (I've mimicked its algorithm). * In tag names, ~ are not allowed... I replace them with "." (which is the behaviour of git-import-orig). Please have a look at the generated repositories above and/or try the script, and give me your feedback. BTW, what will be our plans for the migration? Enjoy! -- Stéphane -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
