[RFC] Conflicts handling in status command

[Aaron Bentley]

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

Guillermo Gonzalez wrote:
> Hi,
>     While working in bzr-eclipse I found two issues related to the status
> command and how it handle conflicts. Both have a bug report: #123472 and
> #127606
> 
> #123472 is about a more compact/condensed output for conflicts. 
> My suggestion is something like this: 
> CM COPYING - Text conflict

That doesn't work.  The first column is reserved for +-R
(add/remove/rename).  Putting C there would interfere with that.  You'd
have to add another column.  Putting text after the filename would make
it hard for scripts to parse the output.

> #127606 is about the behavior of status when specific_files is used (one or
> more files as argumento to 'bzr status'). 
> 'bzr status a.file' always show the conflicts, also if they are not realted
> to the specific_files
> I think this isn't quite right, if I tell bzr i want to known the status of
> a.file, I don't care about conflicts not related to a.file (but I can be
> wrong :))

I think you're right about that one.

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

iD8DBQFGpAlj0F+nu1YWqI0RAkUjAJ0e/fnqyKhTc0d644vYW0Q86dLauQCggIO0
aPXjNuOmAAtGw+RFZB/FuHI=
=WJaX
-----END PGP SIGNATURE-----