On Wed, Jul 13, 2011 at 10:24:47AM -0300, Henrique de Moraes Holschuh wrote: > On Wed, 13 Jul 2011, Roger Leigh wrote: > > 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. > > Ah, nice. Sorry, sent my last email before reading this one. > > Thank you!
No problem! The repo at git://git.debian.org/git/collab-maint/sysvinit now contains the fixed branches and tags. I've retagged everything, and verified that all the tags match the SVN repo contents exactly, using the same script as last time. Only the master and etchnhalf branches required filter-branch, the others all have a branch point prior to the fixed commit, so were not affected. The master and etchnhalf branches are also identical to SVN after the filtering. The only difference between the git and svn repos is that because the svn2git conversion changes svn tags (branches) to git heads, which were then converted to git tags, the git tag timestamp is the time of the git commit being tagged, rather than the timestamp of the original tag operation (the tag time being lost during the svn2git step). In practice this isn't particularly important, and the tags could be manually re-tagged using the exact tag timestamps if this is an issue. This doesn't affect the contents in any way, and since the tags were created immediately after the commit being, it really just means the timestamp is slightly ahead of the old tag timestamp by a few seconds/minutes. So the repo should be good to go, though it wouldn't hurt to be checked for correctness by someone else in case I missed anything. 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.
signature.asc
Description: Digital signature
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel
