[RFC] status showing of conflicts

Aaron Bentley aaron.bentley at utoronto.ca
Thu Jun 15 14:14:25 BST 2006


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

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEkV0x0F+nu1YWqI0RAvTjAJ44rDeOcsKJi3j8ams1VmjXWjLJggCcDrS+
8vCPzNKgfnQXSBHUwYGkbl4=
=+kER
-----END PGP SIGNATURE-----




More information about the bazaar mailing list