tests/histedit-helpers.sh
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Sat, 16 Nov 2013 15:36:50 -0500
changeset 20220 2888a412f0b0
parent 17085 35729bdd59b6
child 27350 890273343170
permissions -rw-r--r--
pull: fix post-pull common computation Before that changes, pulled revision that happend to be already known locally (so, not actually added) was not taken into account when computing the new common set between local and remote. It appears that we already know the heads of the pulled set. It is in the `rheads` variable, so we are just using it and everything is works fine. We are dropping the, now useless, computation of `added` set in the process.

fixbundle() {
    grep -v 'saving bundle' | grep -v 'saved backup' | \
        grep -v added | grep -v adding | \
        grep -v "unable to find 'e' for patching" | \
        grep -v "e: No such file or directory"
}