Fix bug introduced in r51121: gcl upload crashes on a 'revived' file.

Fix bug introduced in r51121: gcl upload crashes on a 'revived' file.

To reproduce, svn delete a file, then svn merge -c -N the file to revive it.

Also fix a unit test that was broken for a while.

TEST=none
BUG=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=75835

[M-A Ruel, 2011-02-23 20:13:14]

Original review introducing this problem: http://codereview.chromium.org/2824035

[nsylvain, 2011-02-23 22:08:35]

LGTM

http://codereview.chromium.org/6576005/diff/1/scm.py
File scm.py (right):

http://codereview.chromium.org/6576005/diff/1/scm.py#newcode713
scm.py:713: # revision the file was deleted.
The new file most likely has a mergeinfo property you could look at. But i would
not worry too much about it.
You may also want to just use "cat" instead of "diff" when this happens.

[M-A Ruel, 2011-02-24 01:37:58]

http://codereview.chromium.org/6576005/diff/1/scm.py
File scm.py (right):

http://codereview.chromium.org/6576005/diff/1/scm.py#newcode713
scm.py:713: # revision the file was deleted.
On 2011/02/23 22:08:35, nsylvain wrote:
> The new file most likely has a mergeinfo property you could look at. But i
would
> not worry too much about it.
> You may also want to just use "cat" instead of "diff" when this happens.

The idea is to not use the svn:mergeinfo metadata since I'd like to know which
revision the file was deleted at. I'll keep 'diff' to use a single code path.