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