Command line tool for resolving all conflicts in favor of 'merge-source'

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jonathan Lange wrote:
> Public bug reported:
>
> It would be really nice if Bazaar had a way to resolve all conflicts in
> favour of 'merge-source' or 'tree'. This is useful when you get a lot of
> spurious conflicts due to criss-cross merges.

I fear that such a command would be misused more often than it was used
correctly. If you're using --lca or --weave, you shouldn't get any
spurious conflicts.

However, revert can do this:
bzr revert -r -1:../merge-source $(bzr conflicts --text)

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIVryf0F+nu1YWqI0RAjy+AJ45oCTkm9LXWWcqP83igx47DAxpuwCePOip
asg1GPj04EFOLUe/k+HSF7w=
=0lMH
-----END PGP SIGNATURE-----

I think the best way to address the issue while still taking Aaron's concern into account is to propose:
1 - force THIS (for all conflicted regions)
2 - force OTHER (for all conflicted regions)
3 - manually solve each conflicted region
4 - force THIS (overriding all cleanly merged modifications)
5 - force OTHER (overriding all cleanly merged modifications)

when interactively resolving the conflicts (which I'm working on lp:~vila/bzr/conflict-manager).

Note that Aaron's command above is (4) in the list, while I suppose jml want (1)

I didn't intend to address that as a first priority though.

And don't rush on that branch, it's vaporware so far.

Thinking more about it, the options may be better understood with:
1 - prefer mine,
2 - prefer theirs,
3 - manually solve each conflicted region,
4 - keep mine,
5 - take theirs