[MERGE] Status honours FILE parameters for conflicts (#127606)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> John Arbash Meinel has voted +1 (conditional).
> Status is now: Conditionally approved
> Comment:
> Shouldn't this:
> +            conflicts = new.conflicts()
> +            if specific_files is not None:
> +                conflicts = conflicts.select_conflicts(new,
> specific_files,
> +                    ignore_misses=True, recurse=True)[1]
> 
> be:
> 
> +            if specific_files is not None:
> +                conflicts = conflicts.select_conflicts(new,
> specific_files,
> +                    ignore_misses=True, recurse=True)[1]
> +            else:
> +                conflicts = new.conflicts()

I'm invoking the ConflictList.select_conflicts.  If I don't do
new.conflicts() first, I won't have a ConflictList assigned to the name
'conflicts'.  So I'll get:

UnboundLocalError: local variable 'conflicts' referenced before assignment

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGpMae0F+nu1YWqI0RAnyJAKCDup6V8CPo5SrrS7N3M8mdGfrIsACcCx0L
wVP86ScdQYKqyippEf4p8sg=
=qmMq
-----END PGP SIGNATURE-----