[RFC] merge with nothing to do should return non-zero

[Martin Pool]

On 8/17/07, Robert Collins <robertc at robertcollins.net> wrote:
> I was just trying to use bzr from a shell script, and I noticed that
> 'bzr merge FOO' when there is nothing missing returns 'Nothing to do'
> but does not return non-zero. This makes it harder to use. Can we do
> something like
> 0 - merge done
> 1 - nothing to do
> 2 - error occured

Agree, except that normally we use 3 for 'user error' (and with my
patch, 4 for 'internal error'.)  I would suggest 2 for 'merge
completed with conflicts'.

-- 
Martin