• Russ Cox's avatar
    codereview: automatically port old diffs forward · 740051ae
    Russ Cox authored
    In the current codereview, if a patch was written against
    a version of a file that had subsequently been edited,
    hg clpatch would fail, even if the patch and the edits were
    in different parts of the file.  In this situation the reviewer
    typically wrote back saying "please hg sync and hg mail
    to update the patch".
    
    This change rewrites the patch automatically, using the
    same transformation that hg sync + hg mail would.
    
    If the interim changes (since the patch was created)
    affect the same line ranges as the patch, clpatch will
    still refuse to apply it.  But this CL should make
    of the trivial conflicts we see just go away.
    
    R=golang-dev, r
    CC=golang-dev
    https://golang.org/cl/4377046
    740051ae
codereview.py 89.8 KB