[MERGE] Avoid losing data when converting a local branch to a lightweight checkout

[Aaron Bentley]

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

Andrew Bennetts wrote:
> Aaron Bentley wrote:
> Oh right.  In that case, this looks like you've jammed a second test into an
> existing test method.  I'd rather you added a separate test for this.
> 
> If nothing else, I suspect I would have been less likely to get confused if the
> new test wasn't cluttered by the other test...
> 
> (See also
> http://xunitpatterns.com/Principles%20of%20Test%20Automation.html#Verify%20One%20Condition%20per%20Test)

I may agree with the general principle of testing only one thing at a
time, but when I want to prove X if-and-only-if Y, it seems to me that
"X if Y" and "not X if not Y" aren't really separate things.

To me, making a single change and showing that the result changes makes
the cause-and-effect relationship more clear, not less.

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

iD4DBQFH+iHB0F+nu1YWqI0RAgWzAKCHkBpKkF5CRm1oOS1/tab/X788GwCWJKzf
rZOXYvbtNMDnkJBiYUKQ/Q==
=9wgU
-----END PGP SIGNATURE-----