[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: How to handle Debian patches



On Mon, May 19, 2008 at 03:29:13PM +0000, Mike Hommey wrote:
> On Mon, May 19, 2008 at 09:58:55AM -0500, Manoj Srivastava wrote:
> > On Mon, 19 May 2008 10:42:54 +0200, Goswin von Brederlow
> > <goswin-v-b@web.de> said:  
> > 
> >         Hmm. You say things like this:
> > > Because the git format is imho conceptualy broken and the
> > > implementation is far from completely thought out. 
> > 
> >         And then you go saying things like that:
> > > It is trivial to generate a quilt format package from git/arch/hg/svn
> > > and I'm sure there will be a RCS-build-package soon enough that does
> > > that. 
> > 
> >         This can not happen without manual intervention, if the topic
> >  branches have overlap. And  Redoing the manual conflict resolution over
> >  and over and over again is a burden (the manual conflict resolution
> >  lives generally in the integration branch history, and can be done
> >  once, and mostly ignored from that point on).
> (...)
> 
> git has git rerere to deal with this.

  Even better, mkdir .git/rr-cache and it'll do it automatically for
you.

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org

Attachment: pgpDxrZ0tCijv.pgp
Description: PGP signature


Reply to: