Which code branch did you use to retrieve code to begin with?
What I mean here is that the merge is against the right branch for making upstream changes to software-properties, but maybe the original code branch isn't the right one, and for now I can't see exactly what the changes you made are. You want to start by retrieving the code to change using 'bzr branch lp:software-properties', then proposing the merge again like this, to be merged into lp:software-properties.
I'm also happy to sponsor a patch attached to the bug you're trying to fix, if that's easier for you.
Which code branch did you use to retrieve code to begin with?
What I mean here is that the merge is against the right branch for making upstream changes to software- properties, but maybe the original code branch isn't the right one, and for now I can't see exactly what the changes you made are. You want to start by retrieving the code to change using 'bzr branch lp:software-properties', then proposing the merge again like this, to be merged into lp:software-properties.
I'm also happy to sponsor a patch attached to the bug you're trying to fix, if that's easier for you.