« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- Committer: Patch Queue Manager
- Date: 2012-09-11 09:09:08 UTC
- mfrom: (6437.74.5 2.5-conn-reset-socket-pipe-1047325)
- mto: (6437.77.1 2.5) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
- mto: This revision was merged to the branch mainline in revision 6563.
- Revision ID: pqm@pqm.ubuntu.com-20120911090908-1xx05ree9c58y4in
(jameinel) Treat socket.error(EPIPE) as a ConnectionReset (bug #1047325) so
that clients will properly reconnect. (John A Meinel)
that clients will properly reconnect. (John A Meinel)
- files modified:
- bzrlib/osutils.py
added
removed
bzrlib/merge.py
