If CVS connection problems occur in the middle of the shelving process, it is not handled very well. I am left with a shelved patch but with some of the modifications still in place. If I try to restore the shelved patch, I get errors about context mismatches and I am unsure whether it has restored the changes correctly since the shelved patch is still listed. It should offer an option to retry on connection failure or rollback the entire shelving operation.