Ticket #7760: trac_7760.patch

File trac_7760.patch, 756 bytes (added by mhansen, 10 years ago)
  • sage-apply-ticket

    # HG changeset patch
    # User Mike Hansen <mhansen@gmail.com>
    # Date 1262553906 28800
    # Node ID 4c8cbfc17dd9dd17d8eb6a643f0ce11cad5ed860
    # Parent  077295915529c4b1fc1d9f23def2747782431081
    Trac #7760: sage -merge fails silently when applying patches with rejects
    
    diff --git a/sage-apply-ticket b/sage-apply-ticket
    a b  
    249249            raise ValueError, "error applying patch %s"%patch_filename
    250250
    251251        msg, err = repo('qpush', interactive=False)
    252         if 'abort' in err:
     252        if 'abort' in err or 'rejects' in err:
    253253            if behavior == 'pop' or behavior == 'finish':
    254254                print "Popping patches from queue ..."
    255255                clear_queue(applied_patches, repos_used)