Opened 11 years ago

Closed 11 years ago

#7760 closed defect (fixed)

sage -merge fails silently when applying patches with rejects

Reported by: mhansen Owned by: GeorgSWeber
Priority: major Milestone: sage-4.3.1
Component: build Keywords:
Cc: craigcitro Merged in: sage-4.3.1.rc1
Authors: Mike Hansen Reviewers: Craig Citro
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:


We need to make sure the hg qpush command is failing with the proper exit code and handle it appropriately.

Attachments (1)

trac_7760.patch (756 bytes) - added by mhansen 11 years ago.

Download all attachments as: .zip

Change History (5)

Changed 11 years ago by mhansen

comment:1 Changed 11 years ago by mhansen

  • Authors set to Mike Hansen
  • Cc craigcitro added
  • Status changed from new to needs_review

comment:2 Changed 11 years ago by craigcitro

  • Status changed from needs_review to positive_review

This is clearly the right fix for the problem Mike ran into, and I'm giving it a positive review.

I'm happy to see this merged, but it brings up a question: why aren't we checking the exit code from mercurial? A quick check of the code reveals the issue: we use os.popen3 inside the hg interface, which we can't easily use to get the return code. (Or, at least, I don't know how to do it.) Maybe we should file an enhancement ticket to rewrite those lines to use subprocess.Popen, and correctly give back the return code?

comment:3 Changed 11 years ago by mhansen

  • Reviewers set to Craig Citro

Yep, I think that sounds good. I don't know how to get it from os.popen3.

comment:4 Changed 11 years ago by rlm

  • Merged in set to sage-4.3.1.rc1
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.