Re: [Haifux] Git Lecture discussion

2008-02-05 Thread Oron Peled
On Tuesday, 5 בFebruary 2008, Ohad Lutzky wrote:
 Regarding keyword substituion: It turns out that Linus thinks it's a
 horrible idea: http://kerneltrap.org/mailarchive/git/2006/10/9/223932

His argument is that it may destroy binary files.

This is bogus since keyword-substitution is *off* by default.
It will occur only for files that were explicitly marked for
substitution. For example in subversion:

   svn propset svn:keywords Id Author Revision *.h *.c

As a substitute (pun intended) for the lack in this feature he gives
a hand crafted, build system dependent, manual (i.e: error prone) method.

What a lame excuse.

[the .sig came out right this time...]

-- 
Oron Peled Voice/Fax: +972-4-8228492
[EMAIL PROTECTED]  http://www.actcom.co.il/~oron
ICQ UIN: 16527398

Linux is a trademark of Linus Torvalds in the USA and other countries.
___
Haifux mailing list
Haifux@haifux.org
http://hamakor.org.il/cgi-bin/mailman/listinfo/haifux


[Haifux] Git Lecture discussion

2008-02-04 Thread Ohad Lutzky
I hope my lecture was bearable :)

Regarding keyword substituion: It turns out that Linus thinks it's a
horrible idea: http://kerneltrap.org/mailarchive/git/2006/10/9/223932
(This has the unfortunate consequence of making several of the attendees
ugly. Sorry everybody ;) ). It turns out I did something very similar
on a whim (not having known keyword substitution beforehand) --- I've
created a make a tarball of this revision script, which tags it
appropriately (in a place appropriate to the application) according to
the tag I've selected.

Regarding rebasing: Indeed, it is only meant to be used when developing
a private branch, and later submitting using git format-patch. (These
patches are later applied using git am, and merging/rebasing works
properly, leaving no duplicate commits). When working on a public topic
branch, rebasing will cause problems for anyone pulling from the
repository, so it's best to resort to ordinary merging. As patches
usually don't need to be formatted for this usage, this isn't a big
price to pay.

There were several other issues explored which I couldn't answer
properly... can anyone please remind me?

Thank you all for coming!
-- 
Man is the only animal that laughs and weeps, for he is the only animal that is 
struck with the difference between what things are and what they ought to be.
 - William Hazlitt
___
Haifux mailing list
Haifux@haifux.org
http://hamakor.org.il/cgi-bin/mailman/listinfo/haifux