Code review comment for lp:~mbp/bzr/402022-merge-preview

Revision history for this message
John A Meinel (jameinel) wrote :

Can we get a final decision on this patch? We're getting really close to the next release, so either we'll break or not. Most likely qbzr has had to sort out the results already.

Personally I'm not a big fan of qbzr hijacking cmd_merge anyway. If you wanted a gui merge, then use "bzr qmerge"...

My personal feeling is this might have been the way to go from the beginning, but we've already broken compatibility such that qbzr has to deal with the fallout. Better to go with our "stable vs development" approach to get more real stability, and not worry about it here.

« Back to merge proposal