Comment 23 for bug 161028

"Hm... the patch doesn't apply at all to revision 164. Is it possible that this patch is against the testing-version?"

Mark,

We're currently at revision 200. And it is definitely against trunk.

Was this a fresh branch? Might the copy you have already had a previous patch applied? I've just applied it cleanly against revision 200 of trunk. And I'm fairly confident no changes have taken place in the relevant source files between 164 and 200.

My suggestion.

bzr pull

bzr revision info

if it doesn't show revision 200

do a

bzr update

you should have revision 200 at this point regardless.

do a

bzr revert

then apply the patch