[MERGE] Fix test kipple in test_break_lock_breaks_physical_lock

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> 
> This patch cleans up some locks that weren't getting unlocked, causing
> test kipple.  It's a break_lock test, so the lock file needs to be
> there, but we can just tell Repo.control_files to leave the file there
> when it unlocks.
> 
> Aaron

BB:approve

At least, I think that is how repo.unlock() is supposed to be used with
"leave_lock_in_place()". and the rest of the tests passes.

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

iD8DBQFItdHvJdeBCYSNAAMRAhv6AJwPUqhliSVc5JEUOF0bWcHJOA5jVACgnTnw
wkkE9v05qOIIV9J86f7Kr9k=
=cXHX
-----END PGP SIGNATURE-----