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

[Alexander Belchenko]

John Arbash Meinel пишет:
> 
> As it turns out, I tracked down the bug. Crappy, crappy bug. Took me way
> too long to find. I had gotten the impression that it was not applying
> the patches, but couldn't figure out why.
> 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.

Thanks for this bug hunting.

> The attached patch fixes this. Its actually a very simple fix, just a
> subtle bug.

Now it works OK. Thanks again.

> 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.
> 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.

+1.

--
Alexander