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.
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.