It might be painful; what's essentially happened is that you and the vendor branch have changed the same chunk of code. When you import and then update, there's a strong probability of conflicts where your changes and the vendor-branch deltas collide. If the changes are *identical*, patch will notice that and skip it, otherwise, you'll have a lot of code conflicts to resolve before you can commit again.
