{"thread":{"id":"2088","subject":"Re: cg-mv","startedAt":"2005-10-12T22:32:14Z","lastAt":"2006-10-28T14:19:05Z","messageCount":12,"participants":["Horst von Brand","Petr Baudis","Jakub Narebski","Horst H. von Brand","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"10062","messageId":"200510122232.j9CMWEhN003974@laptop11.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: cg-mv","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-12T22:32:14Z","receivedAt":"2005-10-12T22:32:14Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> Dear diary, on Fri, Oct 07, 2005 at 04:33:33PM CEST, I got a letter\n> where Zack Brown told me that...\n\n> > IIRC, file renaming is something we only care about at read time, we\n> > don't actually need to track it while making the change, because git\n> > allows us to track data from file to file without having to tell it\n> > that the data is moving.\n\n> > So, just to keep certain people happy, why not have the cg-mv command\n> > defined to something like this:\n\nWhat about git-rename(1)? For completeness, just wrap it into cg-mv.\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria +56 32 654239\nCasilla 110-V, Valparaiso, Chile Fax: +56 32 797513\n"},{"id":"10493","messageId":"200510212146.j9LLkun3004745@inti.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: Scribblings for a cogito/git tutorial","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-21T21:46:56Z","receivedAt":"2005-10-21T21:46:56Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> Dear diary, on Mon, Oct 17, 2005 at 05:04:54PM CEST, I got a letter\n> where Horst von Brand told me that...\n> > I've also been asked around here for a cogito+git tutorial, to that end\n> > I've made up a script that simulates several developers interacting.\n> > Hacking around is simulated by patching, ed(1) scripts (merges don't turn\n> > out the same diff every time), and plain copying new files in. I've set up\n> > a GPG key with an empty passphrase (comment is \"Experimental\") to have\n> > signed tags, etc. in a convenient manner. The idea is to create interesting\n> > histories (for browsing) and show off the commands in a compact way. If\n> > only there was a convenient way to run a strech of the (bash) script, look\n> > at the results, and then resume...\n> > \n> > Comments, suggestions, patches are welcome! \n> > \n> > Repository of the script and supporting files is at\n> > \n\n> Thanks, it's very nice! If you don't mind (actually, is it / can it be GPL?),\n\nCertainly, I realized later that I didn't clarify the license. It's on my\nTODO list ;-)\n\nI'm also thinking on changing the octopus example into one that works and\nclean up some stuff. And perhaps make Bob into a diehard git user, for\ncontrast.\n\n> I added it to Cogito as Documentation/tutorial-script/ .\n\nI'm honored.\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria +56 32 654239\nCasilla 110-V, Valparaiso, Chile Fax: +56 32 797513\n"},{"id":"10492","messageId":"200510212156.j9LLudEQ005267@inti.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: Scribblings for a cogito/git tutorial","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-21T21:56:39Z","receivedAt":"2005-10-21T21:56:39Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> Dear diary, on Mon, Oct 17, 2005 at 05:04:54PM CEST, I got a letter\n> where Horst von Brand told me that...\n\n[...]\n\n> > Repository of the script and supporting files is at\n> > \n\n> Thanks, it's very nice! If you don't mind (actually, is it / can it be GPL?),\n> I added it to Cogito as Documentation/tutorial-script/ .\n\nIt seems you got the whole history of the script into cogito's history. Is\nthat right?\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria +56 32 654239\nCasilla 110-V, Valparaiso, Chile Fax: +56 32 797513\n"},{"id":"10490","messageId":"200510231535.j9NFZrmD019309@inti.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: LCA2006 Git/Cogito tutorial","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-23T15:35:53Z","receivedAt":"2005-10-23T15:35:53Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n\n[...]\n\n> Well, it's true that cg-Xmergefile still does not handle all merge\n> cases, but it certainly will not be silent about it, at least. ;-)\n\nThe Codeville people seem to have taken a hard\nlook at merging, but I don't find any clear references to their algorithm.\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria +56 32 654239\nCasilla 110-V, Valparaiso, Chile Fax: +56 32 797513\n"},{"id":"10501","messageId":"20051023223635.GV30889@pasky.or.cz","threadId":"2088","inReplyTo":"200510212156.j9LLudEQ005267@inti.inf.utfsm.cl","subject":"Re: Scribblings for a cogito/git tutorial","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-23T22:36:35Z","receivedAt":"2005-10-23T22:36:35Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Oct 21, 2005 at 11:46:56PM CEST, I got a letter\nwhere Horst von Brand told me that...\n> I'm also thinking on changing the octopus example into one that works and\n> clean up some stuff. And perhaps make Bob into a diehard git user, for\n> contrast.\n\nNice idea to show all the angles - although for Cogito I think I will\nstay with pure Cogito (wherever possible), no need to scare the users...\n;-))\n\nDear diary, on Fri, Oct 21, 2005 at 11:56:39PM CEST, I got a letter\nwhere Horst von Brand told me that...\n> > > Repository of the script and supporting files is at\n> > > \n> \n> > Thanks, it's very nice! If you don't mind (actually, is it / can it be GPL?),\n> > I added it to Cogito as Documentation/tutorial-script/ .\n> \n> It seems you got the whole history of the script into cogito's history. Is\n> that right?\n\nNope. I couldn't just merge (like gitk-in-git) since I needed to move\nthe files to a subdirectory, so I would have to do that manually. And I\ndecided to just flatten it since it was just two revisions, after all.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"10502","messageId":"20051023223901.GW30889@pasky.or.cz","threadId":"2088","inReplyTo":"200510231535.j9NFZrmD019309@inti.inf.utfsm.cl","subject":"Re: LCA2006 Git/Cogito tutorial","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-23T22:39:01Z","receivedAt":"2005-10-23T22:39:01Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Oct 23, 2005 at 05:35:53PM CEST, I got a letter\nwhere Horst von Brand told me that...\n> Petr Baudis wrote:\n> \n> [...]\n> \n> > Well, it's true that cg-Xmergefile still does not handle all merge\n> > cases, but it certainly will not be silent about it, at least. ;-)\n> \n> The Codeville people seem to have taken a hard\n> look at merging, but I don't find any clear references to their algorithm.\n\nThey are working on something much more general, basically abandoning\nthe three-level (RCS-like) merging model altogether and going for the\nweave (SCCS-like) merging model instead. See also\n\n\thttp://revctrl.org/PreciseCodevilleMerge\n\nand short crawling around the wiki and external links should give you\npretty good idea (see especially SimpleWeaveMerge).\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"10532","messageId":"200510240022.j9O0M5B0028531@laptop11.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: LCA2006 Git/Cogito tutorial","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-24T00:22:05Z","receivedAt":"2005-10-24T00:22:05Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter\n> where Horst von Brand told me that...\n> > Martin Langhoff (CatalystIT) wrote:\n> > [...]\n> > > MERGE ERROR: : Not handling case -> ->\n\n> > It happens when a new file with the same name appears in both parents. For\n> > example, we both see the need for a README file, and then I pull from you\n> > and try to merge into my version.\n\n> It certainly shouldn't happen with precisely that error message - there\n> should be at least something written between the arrows.\n\nIt does now.\n\n> And yes, there\n> are unhandled cases like that, as I wrote in one of my other mails.\n\nYep, thanks!\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria +56 32 654239\nCasilla 110-V, Valparaiso, Chile Fax: +56 32 797513\n"},{"id":"295769","messageId":"200610250133.k9P1XSVf006467@laptop13.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: [PATCH] xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines","fromName":"Horst H. von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2006-10-25T01:33:28Z","receivedAt":"2006-10-25T01:33:28Z","isPatch":true,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> This removes the '#' and '(' tests and adds a '$' test instead although I\n> have no idea what it is actually good for - but hey, if that's what GNU\n> diff does...\n\n$ starts a shell (or Perl) variable...\n\n> Pasky only went and did as Junio sayeth.\n\nHorst adds a guesse...\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 2654431\nUniversidad Tecnica Federico Santa Maria +56 32 2654239\n"},{"id":"297688","messageId":"7vejsxf88x.fsf@assigned-by-dhcp.cox.net","threadId":"2088","inReplyTo":"200610250133.k9P1XSVf006467@laptop13.inf.utfsm.cl","subject":"Re: [PATCH] xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-25T02:18:38Z","receivedAt":"2006-10-25T02:18:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Horst H. von Brand\" writes:\n\n> Petr Baudis wrote:\n>> This removes the '#' and '(' tests and adds a '$' test instead although I\n>> have no idea what it is actually good for - but hey, if that's what GNU\n>> diff does...\n>\n> $ starts a shell (or Perl) variable...\n>\n>> Pasky only went and did as Junio sayeth.\n>\n> Horst adds a guesse...\n\nIf I have to guess, I think that is from VMS.\n"},{"id":"297158","messageId":"200610260106.k9Q168ik006648@laptop13.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: VCS comparison table","fromName":"Horst H. von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2006-10-26T01:06:08Z","receivedAt":"2006-10-26T01:06:08Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> Dear diary, on Thu, Oct 26, 2006 at 12:29:17AM CEST, I got a letter\n> where Jakub Narebski said that...\n> > Cute names are taken: CoGITo, gitk, qgit (GTK+ history viewer is gitview,\n> > not ggit, curiously ;-) and tig.\n> \n> wit?\n\nWig. \n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 2654431\nUniversidad Tecnica Federico Santa Maria +56 32 2654239\n"},{"id":"295381","messageId":"200610271708.k9RH8thM022812@laptop13.inf.utfsm.cl","threadId":"2088","inReplyTo":"pasky@suse.cz","subject":"Re: Creating new repos","fromName":"Horst H. von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2006-10-27T17:08:55Z","receivedAt":"2006-10-27T17:08:55Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Petr Baudis wrote:\n> Dear diary, on Fri, Oct 27, 2006 at 02:29:10PM CEST, I got a letter\n> where \"Horst H. von Brand\" said that...\n> > I'm trying to set up git repos for remote access here. I set up git-daemon\n> > and got it working (some older repositories do work fine), but now:\n> > \n> > $ mkdir /var/scm/user/SomeRepo.git\n> > $ cd /var/scm/user/SomeRepo.git\n> > $ git --bare init-db\n> > $ touch git-daemon-export-ok\n> > \n> > All OK, but then, from a remote machine:\n> > \n> > $ git clone git://git-server/user/SomeRepo.git\n> > fatal: no matching remote head\n> > fetch-pack from 'git://git-server/user/Test.git' failed.\n\n> > The empty repo created by init-db should be cloneable, so as to get the\n> > ball rolling easily.\n\n> Well there's really nothing to clone, so it's tough. :-) What would such\n> a clone be supposed to do? It has no branches to record as belonging to\n> origin, and note that Git's git-clone is long-term broken in the sense\n> that it won't pick new branches as they appear in the remote\n> repository. So a clone of an empty repository would be useless anyway.\n\nAs useless as the empty set? ;-)\n\n> > You can't push into such an empty repository either.\n> \n> This is supposed to work. What error do you get?\n\nPilot error. Sorry for the noise.\n\n> > Any suggestion of how to set up a server into which users can create their\n> > own repos /without/ giving out full shell accounts?\n> \n> Sure:\n> \n> \thttp://repo.or.cz/w/repo.git\n\nCloning... \n\"error: Can't lock ref\" (?)\n\nOK, got it; the repo is at git://repo.or.cz/repo.git. Better not calling it\n*.git\n\n> But it may be quite an overkill for you. ;-)\n\nWill see.\n\n> If you want them to be able to do it over ssh, you would need to provide\n> a trusted tool which would manage the repository setup, that means not\n> only doing init-db, but also managing the export-ok files, description\n> file, you'd likely want to enable the post-update hook (but probably not\n> any other hook or let the user edit it since at that point you've given\n> him full shell access), etc. And the tool would have to be carefully\n> reviewed since it's security-critical.\n\nI was fearing something along these lines...\n\n> > Also, the behaviour of git-daemon is different when using git or ssh+git,\n> > you need to give the full path for the later but not the former (given\n> > --base-path=/var/scm):\n> > \n> > git://git-server/user/Test.git\n> > ssh+git://git-server/var/scm/user/Test.git\n> > \n> > Is this intentional?\n> \n> git+ssh has nothing to do with git-daemon, it's executing other git\n> commands remotely.\n\nOK. But from an UI POW it is confusing.\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 2654431\nUniversidad Tecnica Federico Santa Maria +56 32 2654239\n"},{"id":"294685","messageId":"ehvor7$20j$1@sea.gmane.org","threadId":"2088","inReplyTo":"200610271708.k9RH8thM022812@laptop13.inf.utfsm.cl","subject":"Re: Creating new repos","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-10-28T14:19:05Z","receivedAt":"2006-10-28T14:19:05Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Horst H. von Brand wrote:\n> Petr Baudis wrote:\n>> Dear diary, on Fri, Oct 27, 2006 at 02:29:10PM CEST, I got a letter\n>> where \"Horst H. von Brand\" said that...\n\n>>>   git://git-server/user/Test.git\n>>>   ssh+git://git-server/var/scm/user/Test.git\n>>> \n>>> Is this intentional?\n>> \n>> git+ssh has nothing to do with git-daemon, it's executing other git\n>> commands remotely.\n> \n> OK. But from an UI POW it is confusing.\n\nYou can use ssh:// instead of ssh+git:// if you like. ssh+git:// is to note\nthat you should use git for that...\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"}]}