threads / discuss / 2088

Re: cg-mv

Subject: Re: cg-mv

## tl;dr

12 messages between Oct 12, 2005 and Oct 28, 2006.

replies: 11people: 4as markdown or json

Horst von Brand· Oct 12, 2005, 22:32 UTC · lore
Petr Baudis <pasky@suse.cz> wrote:
> Dear diary, on Fri, Oct 07, 2005 at 04:33:33PM CEST, I got a letter
> where Zack Brown <zbrown@tumblerings.org> 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· Oct 21, 2005, 21:46 UTC · lore

Re: Scribblings for a cogito/git tutorial

Petr Baudis <pasky@suse.cz> wrote:
Show 16 quoted lines
> Dear diary, on Mon, Oct 17, 2005 at 05:04:54PM CEST, I got a letter
> where Horst von Brand <vonbrand@inf.utfsm.cl> 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
> > <http://pincoya.inf.utfsm.cl/Script.git>
> 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· Oct 21, 2005, 21:56 UTC · lore

Re: Scribblings for a cogito/git tutorial

Petr Baudis <pasky@suse.cz> wrote:
> Dear diary, on Mon, Oct 17, 2005 at 05:04:54PM CEST, I got a letter
> where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...
[...]
> > Repository of the script and supporting files is at
> > <http://pincoya.inf.utfsm.cl/Script.git>
> 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
Petr Baudis· Oct 23, 2005, 22:36 UTC · re: Horst von Brand · lore

Re: Scribblings for a cogito/git tutorial

Dear diary, on Fri, Oct 21, 2005 at 11:46:56PM CEST, I got a letter where Horst von Brand <vonbrand@inf.utfsm.cl> 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 <vonbrand@inf.utfsm.cl> told me that...

Show 8 quoted lines
> > > Repository of the script and supporting files is at
> > > <http://pincoya.inf.utfsm.cl/Script.git>
> 
> > 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.
Horst von Brand· Oct 23, 2005, 15:35 UTC · lore

Re: LCA2006 Git/Cogito tutorial

Petr Baudis <pasky@suse.cz> 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 <http://www.codeville.org> 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· Oct 23, 2005, 22:39 UTC · re: Horst von Brand · lore

Re: LCA2006 Git/Cogito tutorial

Dear diary, on Sun, Oct 23, 2005 at 05:35:53PM CEST, I got a letter where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...

Show 9 quoted lines
> Petr Baudis <pasky@suse.cz> 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 <http://www.codeville.org> 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· Oct 24, 2005, 00:22 UTC · lore

Re: LCA2006 Git/Cogito tutorial

Petr Baudis <pasky@suse.cz> wrote:
Show 5 quoted lines
> Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter
> where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...
> > Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> 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· Oct 25, 2006, 01:33 UTC · lore

Re: [PATCH] xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines

Petr Baudis <pasky@suse.cz> 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· Oct 25, 2006, 02:18 UTC · re: Horst H. von Brand · lore

Re: [PATCH] xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines

"Horst H. von Brand" <vonbrand@inf.utfsm.cl> writes:
Show 10 quoted lines
> Petr Baudis <pasky@suse.cz> 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· Oct 26, 2006, 01:06 UTC · lore

Re: VCS comparison table

Petr Baudis <pasky@suse.cz> wrote:
Show 6 quoted lines
> Dear diary, on Thu, Oct 26, 2006 at 12:29:17AM CEST, I got a letter
> where Jakub Narebski <jnareb@gmail.com> 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· Oct 27, 2006, 17:08 UTC · lore

Re: Creating new repos

Petr Baudis <pasky@suse.cz> wrote:
Show 15 quoted lines
> Dear diary, on Fri, Oct 27, 2006 at 02:29:10PM CEST, I got a letter
> where "Horst H. von Brand" <vonbrand@inf.utfsm.cl> 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.
Show 5 quoted lines
> 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.
Show 6 quoted lines
> > 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.
Show 7 quoted lines
> 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...
Show 11 quoted 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· Oct 28, 2006, 14:19 UTC · re: Horst H. von Brand · lore

Re: Creating new repos

Horst H. von Brand wrote:
> Petr Baudis <pasky@suse.cz> wrote:
>> Dear diary, on Fri, Oct 27, 2006 at 02:29:10PM CEST, I got a letter
>> where "Horst H. von Brand" <vonbrand@inf.utfsm.cl> said that...
Show 9 quoted lines
>>>   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

← back to recent threads