lkml.org 
[lkml]   [2006]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: 2.6.18-mm1
    Dear diary, on Sun, Sep 24, 2006 at 02:46:47PM CEST, I got a letter
    where Russell King <rmk+lkml@arm.linux.org.uk> said that...
    > On Sun, Sep 24, 2006 at 04:02:15AM -0700, Andrew Morton wrote:
    > > git-arm.patch
    >
    > It's worth pointing out that something has gone horribly wrong in the
    > devel branch of this tree, resulting in a load of files being deleted
    > which shouldn't have been.
    >
    > Absolutely no idea how that happened, but it's a commit buried behind
    > lots of other commits and has taken some 4 days to be spotted. At a
    > guess, a perl bug where a new associative array somehow manages to pick
    > up on old values and forget values from previous assignments.
    >
    > Oddly, running the script in debug mode (where the only things which
    > don't happen is the git commands get called) appears to give correct
    > behaviour.
    >
    > So I'm in the situation where I need to rebuild 4 days work in the ARM
    > devel tree. ;(

    If I understand correctly, you just need to get rid of that bad commit?

    Can you copy the missing files (in the suitable tree structure) to
    /tmp/missing/ and try this?

    cg-admin-rewritehist -r EVILCOMMIT \
    --tree-filter 'cp -r /tmp/missing/* .' \
    --commit-filter \
    'if [ "$GIT_COMMIT" = "EVILCOMMIT" ]; then
    shift;
    while [ -n "$1" ]; do
    shift; echo "$1"; shift;
    done;
    else
    git-commit-tree "$@";
    fi' \
    fixedbranch
    (s/EVILCOMMIT/thesha1id/)

    Now check if fixedbranch looks ok.

    --
    Petr "Pasky" Baudis
    Stuff: http://pasky.or.cz/
    #!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
    $/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
    lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-09-24 15:25    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean