[RFC] status showing of conflicts

[Aaron Bentley]

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

John Arbash Meinel wrote:
> 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.

Sure.  Actually, I think that's independent of this.

> 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)

Yes, there's something wrong with remerge.  I haven't had a look at it
yet, but it's probably small.

I think it would be nice if the conflict-checker could determine when
text conflicts have been fixed (by scanning for herringbone markers),
though I don't know when we would delete the BASE, THIS, OTHER files then.

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

iD8DBQFEkWxo0F+nu1YWqI0RAnizAJ9gJe1hv8zn7I7bsIqzt5sWP4D+JQCggc6F
BTW8vzdxAQuGNOVdtjtydXc=
=tLwD
-----END PGP SIGNATURE-----