I should add that the pathlookup directory was removed by the merge, but there was a conflict since a file inside the pathlookup directory had been modified in branch.
Doing 'mkdir lib/canonical/launchpad/pathlookup' made 'bzr commit' work.
I should add that the pathlookup directory was removed by the merge, but there was a conflict since a file inside the pathlookup directory had been modified in branch.
Doing 'mkdir lib/canonical/ launchpad/ pathlookup' made 'bzr commit' work.