Comment 11 for bug 67174

Revision history for this message
Luke-Jr (luke-jr) wrote : Re: [master] record cherry-pick merges

Another possibility wrt merging: Throw an error if a merge would include cherry-picked revisions, saying something like "Cannot merge revision 54 to 202: Revision 99 is already merged. First, merge up to revision 98."

To make this smoother, Bazaar could also support doing multiple merges in a single commit.