Code review comment for lp:~ignacio-nin/percona-xtradb-cluster/fix-revno375

Ignacio,

please, don't use "bzr rm". As I understand, the intention here is to get rid of conflicts in Makefile. But this patch does the reverse: whenever there's a change in PS Makefile (even the one that does not conflict with PXC changes), you'll get a contents conflict due to file-ids mismatch.

If you want to merge changes from Makefile in PS to Makefile in PXC, you need to keep the current Makefile with the same file-id as in the PS branch. Whenever you get _text_ conflicts, you have to fix them. If you get them frequently, think how Makefile can be changed to reduce those conflicts. Perhaps there must be a make variable controlling Makefile's behavior. Or maybe just moving frequently changing part in PS Makefile would be sufficient to avoid most conflicts?

If you never want to merge PS Makefile into PXC Makefile (which I doubt), you can rename Makefile into something else in the PXC branch and add a new file with the same name. But I don't think that's what we really need. PXC is still a "branch" of PS, so we make some build-related changes in PS we want to replicate them in PXC in most cases, right? So merging is a natural way to do that.