[BUG] cannot merge bundle if standalone branch was in shared repo

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Eventually I tracked down the fact that we were using 'os.path.join'
> instead of osutils.pathjoin(). So internally it wasn't seeing that the
> files were patched, because it was noting: 'file/foo' was patched, but
> checking whether 'file\foo' is patched when it went to compute the
> inventory.
> 
> The attached patch fixes this. Its actually a very simple fix, just a
> subtle bug.

+1

I'd be happier with a test case, but as you say, the test suite already
fails on win32, so that makes sense.

> If I can get a +1 on this, I'll go ahead and merge the rest of my win32
> fixes, along with Aaron's strict testament patch, and then I'll continue
> working on win32 stuff.

I think the strict testament patch needs a blackbox test at least.

> If we can get it to the point that we don't have lots of test failures,
> it becomes much easier to find these kinds of bugs.

Would be nice.  I'm certainly willing to contribute to getting win32
working.

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

iD8DBQFElhcz0F+nu1YWqI0RAgSYAJ9r0r6RL9ukh5FHximqbfaSWdvpVACfQOKA
f7G6fW3Z4qKV8utJoQtHm9k=
=M8Qk
-----END PGP SIGNATURE-----