[merge] win32- fix test_bundle

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Hopefully this is my last win32 related bugfix for a while. And it
> should be, since the test suite now passes :)
> 
> Anyway, I updated the test suite to use a starting space, rather than a
> trailing space. Which is supported on win32.

I thought that it made a lot of sense to be testing for trailing spaces.
 That's the kind of area where bundles are most vulnerable.

I'd prefer to move this and the tab test into a different test, and skip
it on Win32.

> Actually, if you do os.path.abspath('file ')
>>>>> os.path.abspath('file ')
> 'h:\\dev\\bzr\\win32\\file'
> 
> And if you just use explorer to try to create a file with a trailing
> space, it will strip it.

Yeah, I tested that in Python, too.

@@ -411,6 +418,10 @@
             rh = self.b1.revision_history()
             tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
             tree.update()
+            delta = compare_trees(tree,
+                                self.b1.repository.revision_tree(rev_id))
+            self.assertFalse(delta.has_changed(),
+                             'Working tree has modifications')
         return tree

I'd like to switch the order of the trees.  When I examined the delta
here, it said 'file with trailing space added', which was confusing
because that path was actually missing from the working tree.

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

iD8DBQFEpy5e0F+nu1YWqI0RAkabAJ9JlSeRxAfhYB5X72FAjK8IaIUJOgCfQAA4
PKlpcGFpKx22R1exO+pRmW0=
=G2MF
-----END PGP SIGNATURE-----