[Pkg-sysvinit-devel] git repository for sysvinit

[Roger Leigh]

On Wed, Jul 13, 2011 at 08:46:41AM +0100, Roger Leigh wrote:
> On Tue, Jul 12, 2011 at 11:21:21PM +0100, Roger Leigh wrote:
> > On Tue, Jul 12, 2011 at 06:30:49PM -0300, Henrique de Moraes Holschuh wrote:
> > > On Tue, 12 Jul 2011, Roger Leigh wrote:
> > > > Dodgy tags:
> > > >   2.86.ds1-22[.new[@936]]
> > 
> > This one contains two real commits with tree changes after the
> > last common commit (87f6c32c).  This once can't be fixed by moving
> > the tag to a different commit.
> > 
> > % git log 87f6c32c..2.86.ds1-22 
> > commit ea266eee14406dee3ead64ab9b4d32ed0e6f8885
> > Author: Petter Reinholdtsen <pere at debian.org>
> > Date:   Sat Sep 16 10:41:47 2006 +0000
> > 
> >     Correct tags.
> > 
> > commit 6b7f63bddd44e96daeb481eec0f196abe48ac650
> > Merge: b3e6d86 87f6c32
> > Author: Petter Reinholdtsen <pere at debian.org>
> > Date:   Sat Sep 16 10:17:15 2006 +0000
> > 
> >     tagging version 2.86.ds1-22
> > 
> > one which is AFAICT unfixable (2.86.ds1-22).
> 
> Thinking about this some more, it should be possible to
> edit the history to graft the subsequent history on the
> master branch after this commit which would make the
> entire history linear.  It's just a matter of finding the
> necessary git magic.  (Not a standard rebase, since we
> don't want any of the trees to change, just the parent
> of one commit.)  Once that's done, it's just a simple
> matter of retagging.

I've been able to merge it into the master branch using
"git replace" and "git filter-branch".  Because it changes
all the commit SHA1s, everything after 2.86.ds1-22 needs
retagging, but that won't be too hard.  This is on the
"rewrite" branch in the repo.  It's identical to the
master branch except for the addition of the missing
commits into the history.  I'll retag and revalidate it
before replacing the master branch with the rewritten
version, and then it should be perfect.


Regards,
Roger

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-sysvinit-devel/attachments/20110713/d05fd242/attachment-0001.pgp>