Hi,

On Thu, 01 Nov 2007, Ian Jackson wrote:
> Raphael Hertzog writes ("Re: Bug#20471: patch to check rdepends on unpack"):
> > I just did that locally and attached is the corresponding patch (created
> > by git-format-patch for easy inclusion). I adjusted the commit log, the
> > changelog and fixed some trailing spaces (that the pre-commit hook
> > forbid me to commit).
> 
> Where is your patch available as a public git branch ?

bug20471 branch in git://git.debian.org/~rhertzog/dpkg.git
http://git.debian.org/?p=users/hertzog/dpkg.git;a=shortlog;h=bug20471

On Thu, 01 Nov 2007, Ian Jackson wrote:
> Raphael Hertzog writes ("Re: Bug#20471: patch to check rdepends on unpack"):
> > I just did that locally and attached is the corresponding patch (created
> > by git-format-patch for easy inclusion). I adjusted the commit log, the
> > changelog and fixed some trailing spaces (that the pre-commit hook
> > forbid me to commit).
> 
> Firstly, surely applying patches, rather than merging using the RCS,
> defeats the purpose of using the RCS ?

As long as the serie of patches matches the series of commits, it doesn't
make any difference for git. git-format-patch and git-am are precisely
used to exchange "changesets" over email.

(We come again to the same discussion: it's the content that matters not the
precise id of the commit)

> Secondly, what is wrong with a bit of trailing whitespace ?

Not much, except that we advise to enable the default pre-commit hooks and
it forbids committing with trailing whitespaces (but the reason we suggest
this is that it also forbids to commit conflict markers, and some
translators managed to do this).

And I got caught by this after cherry-picking your commit on top of the
official master branch.

Cheers,
-- 
Raphaël Hertzog

Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/



Reply via email to