[RFC] status showing of conflicts

[John Arbash Meinel]

Aaron Bentley wrote:
> Robert Collins wrote:
>>> Current status always shows all the conflicts. I think 'bzr status FOO'
>>> should only show conflicts for FOO, and FOO/**.
> 
> That sounds reasonable.  You can use ConflictList.select_conflicts as a
> starting point for this.  It follows file-ids properly, and checks both
> paths for conflicts involving two files, but it's not recursive.
> 
> Aaron

If we do this, it would also be really nice if we don't show the .BASE,
.ORIG, etc files as unknown if we know the file is conflicted.

Though I've seen a few times that the current conflict code seems to
forget that a file is conflicted (after remerge???). So at this point I
don't mind seeing it as a second check that I haven't missed anything.
(Though the test suite usually finds the <<<< lines as well)

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060615/a72d671b/attachment.pgp