Revert of In rebaseline.py, update SCM and expectations all at once after all commands.

Revert of In rebaseline.py, update SCM and expectations all at once after all commands. (patchset #2 id:20001 of https://codereview.chromium.org/2341643005/ )

Reason for revert:
Caused rebaseline-o-matic to fail: http://crrev.com/650944

Could be re-landed with a fix.

Original issue's description:
> In rebaseline.py, update SCM and expectations all at once after all commands.
>
> This is meant to fix http://crbug.com/639410 by making it so that if there are files that are both added and deleted (e.g. downloaded and then de-duped), they won't ever be staged since all changes would be aggregated and de-duped before running git add/rm.
>
> BUG=639410
>
> Committed: https://crrev.com/34fdc9df872c6ce13e6c3c546084435321d4e882
> Cr-Commit-Position: refs/heads/master@{#420461}

TBR=dpranke@chromium.org,wkorman@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=639410
Committed: https://crrev.com/48a6db917e5860b4798c5c16565bbc03304433d3
Cr-Commit-Position: refs/heads/master@{#421556}

[qyearsley, 2016-09-28 16:03:18]

The CQ bit was checked by qyearsley@chromium.org

[qyearsley, 2016-09-28 16:03:19]

Created Revert of In rebaseline.py, update SCM and expectations all at once
after all commands.

[commit-bot: I haz the power, 2016-09-28 16:03:45]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-28 16:06:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-28 16:06:19]

Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[qyearsley, 2016-09-28 16:21:18]

The CQ bit was checked by qyearsley@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-28 16:21:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Dirk Pranke, 2016-09-28 16:33:51]

lgtm

[qyearsley, 2016-09-28 16:47:36]

The CQ bit was unchecked by qyearsley@chromium.org

[qyearsley, 2016-09-28 16:47:38]

The CQ bit was checked by qyearsley@chromium.org

[commit-bot: I haz the power, 2016-09-28 16:47:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-28 17:28:05]

Committed patchset #2 (id:120001)

[commit-bot: I haz the power, 2016-09-28 17:31:38]

Description was changed from

==========
Revert of In rebaseline.py, update SCM and expectations all at once after all
commands. (patchset #2 id:20001 of https://codereview.chromium.org/2341643005/ )

Reason for revert:
Caused rebaseline-o-matic to fail: http://crrev.com/650944

Could be re-landed with a fix.

Original issue's description:
> In rebaseline.py, update SCM and expectations all at once after all commands.
> 
> This is meant to fix http://crbug.com/639410 by making it so that if there are
files that are both added and deleted (e.g. downloaded and then de-duped), they
won't ever be staged since all changes would be aggregated and de-duped before
running git add/rm.
> 
> BUG=639410
> 
> Committed: https://crrev.com/34fdc9df872c6ce13e6c3c546084435321d4e882
> Cr-Commit-Position: refs/heads/master@{#420461}

TBR=dpranke@chromium.org,wkorman@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=639410
==========

to

==========
Revert of In rebaseline.py, update SCM and expectations all at once after all
commands. (patchset #2 id:20001 of https://codereview.chromium.org/2341643005/ )

Reason for revert:
Caused rebaseline-o-matic to fail: http://crrev.com/650944

Could be re-landed with a fix.

Original issue's description:
> In rebaseline.py, update SCM and expectations all at once after all commands.
>
> This is meant to fix http://crbug.com/639410 by making it so that if there are
files that are both added and deleted (e.g. downloaded and then de-duped), they
won't ever be staged since all changes would be aggregated and de-duped before
running git add/rm.
>
> BUG=639410
>
> Committed: https://crrev.com/34fdc9df872c6ce13e6c3c546084435321d4e882
> Cr-Commit-Position: refs/heads/master@{#420461}

TBR=dpranke@chromium.org,wkorman@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=639410

Committed: https://crrev.com/48a6db917e5860b4798c5c16565bbc03304433d3
Cr-Commit-Position: refs/heads/master@{#421556}
==========

[commit-bot: I haz the power, 2016-09-28 17:31:40]

Patchset 2 (id:??) landed as
https://crrev.com/48a6db917e5860b4798c5c16565bbc03304433d3
Cr-Commit-Position: refs/heads/master@{#421556}

[qyearsley, 2016-10-04 22:27:03]

A revert of this CL (patchset #2 id:120001) has been created in
https://codereview.chromium.org/2396433004/ by qyearsley@chromium.org.

The reason for reverting is: Create reland patch.