Comment 15 for bug 263302

Merge doesn't seem like the right tool in this situation. If you want to oversee text merges, then you would want to oversee file adds, deletes, and all other operations that a merge might perform.

The tla "update" command fit this role well, because it only applied the changes that were new since the last merge. bzr would need to record cherrypicks in order to emulate this.

Alternatively, you can simulate the update behavior with merge.

Let's say you have two branches, A and B, and each has a revision "2" that you don't want to merge.

$ bzr merge -d A B -r 3..5
$ bzr commit A -m "Merged from B"
# Make two commits to B
$ bzr merge -d A B -r 5..7
$ bzr commit A -m "Merged two revisions from B"
etc, etc.
# When merging back to B, use the most recent revision of A not merged into B
$ bzr merge -d B A -r 3..5