automatically run editor on conflicted files after merge

[Martin Pool]

Some people would like an option to run their editor on all the conflicted files after the merge. If they resolve the conflicts (removing the conflict markers) then the files should be considered resolved.

[Aaron Bentley (abentley)]

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

Martin Pool wrote:
> Public bug reported:
>
> Some people would like an option to run their editor on all the
> conflicted files after the merge. If they resolve the conflicts
> (removing the conflict markers) then the files should be considered
> resolved.

This is very easy to script:

$EDITOR $(bzr conflicts --text) && bzr resolved

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

iD8DBQFGnDfT0F+nu1YWqI0RAodTAJ4jiXa+KTTuQoWOM0HzxFVGqaqCGACaA7IM
VfqYbmNRyCXR7WtiQZ7FdLo=
=606R
-----END PGP SIGNATURE-----

[Martin Pool (mbp)]

On 7/17/07, Aaron Bentley <email address hidden> wrote:
> This is very easy to script:
>
> $EDITOR $(bzr conflicts --text) && bzr resolved

Yes, that's what I commonly do. But it would be easier for some users
if it was built in.

--
Martin