I have a sequence of 7 WebRTC CLs:
remove0 : https://codereview.webrtc.org/2033433004
remove1 : https://codereview.webrtc.org/2037623002
remove2 : https://codereview.webrtc.org/2035663002
remove3 : https://codereview.webrtc.org/2038513002
remove4 : https://codereview.webrtc.org/2049683003
remove5 : https://codereview.webrtc.org/2045943004
remove6 : https://codereview.webrtc.org/2056653002

I've tested the first three successfully on the try bots, but the fourth (remove3) (and, obviously, the following too) get patch application errors, even though I've repeatedly made sure to rebase the entire sequence.

The following suspicios-looking output is in the patch error log:

Failed to apply patch for webrtc/voice_engine/file_player_impl.h:
While running git rm webrtc/voice_engine/file_player_impl.h;
  error: the following file has changes staged in the index:
      webrtc/voice_engine/file_player_impl.h
  (use --cached to keep the file, or -f to force removal)

That file is created (by a move) in remove1, modified in remove2, and deleted in remove3 (because its content is moved to another file). Am I doing something that triggers a bug in the patch application logic?